aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-27 10:18:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-27 10:18:26 -0700
commit54726f14b53cae061c504ac572320a16a5616de5 (patch)
treeb7ab3b1dd5d938f395a82ca25b84f4a0dc6c8f0d /drivers
parent8784cdd9af0e3b6a8a42b538db51d7f1951be956 (diff)
parented37d83e6aa218192fb28bb6b82498d2a8c74070 (diff)
downloadkernel_samsung_tuna-54726f14b53cae061c504ac572320a16a5616de5.zip
kernel_samsung_tuna-54726f14b53cae061c504ac572320a16a5616de5.tar.gz
kernel_samsung_tuna-54726f14b53cae061c504ac572320a16a5616de5.tar.bz2
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: raid5: change incorrect usage of 'min' macro to 'min_t'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/raid5.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 3c3626d..5d400ae 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3811,13 +3811,13 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
safepos = conf->reshape_safe;
sector_div(safepos, data_disks);
if (mddev->delta_disks < 0) {
- writepos -= min(reshape_sectors, writepos);
+ writepos -= min_t(sector_t, reshape_sectors, writepos);
readpos += reshape_sectors;
safepos += reshape_sectors;
} else {
writepos += reshape_sectors;
- readpos -= min(reshape_sectors, readpos);
- safepos -= min(reshape_sectors, safepos);
+ readpos -= min_t(sector_t, reshape_sectors, readpos);
+ safepos -= min_t(sector_t, reshape_sectors, safepos);
}
/* 'writepos' is the most advanced device address we might write.