diff options
| author | Linus Torvalds | 2009-05-27 19:18:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-05-27 19:18:26 +0200 |
| commit | 54726f14b53cae061c504ac572320a16a5616de5 (patch) | |
| tree | b7ab3b1dd5d938f395a82ca25b84f4a0dc6c8f0d | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | md: raid5: change incorrect usage of 'min' macro to 'min_t' (diff) | |
| download | kernel-qcow2-linux-54726f14b53cae061c504ac572320a16a5616de5.tar.gz kernel-qcow2-linux-54726f14b53cae061c504ac572320a16a5616de5.tar.xz kernel-qcow2-linux-54726f14b53cae061c504ac572320a16a5616de5.zip | |
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'
| -rw-r--r-- | drivers/md/raid5.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 3c3626d2a1f9..5d400aef8d9b 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. |