diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 13:18:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 13:18:26 -0400 |
| commit | 54726f14b53cae061c504ac572320a16a5616de5 (patch) | |
| tree | b7ab3b1dd5d938f395a82ca25b84f4a0dc6c8f0d /drivers | |
| parent | 8784cdd9af0e3b6a8a42b538db51d7f1951be956 (diff) | |
| parent | ed37d83e6aa218192fb28bb6b82498d2a8c74070 (diff) | |
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.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 | |||
| 3811 | safepos = conf->reshape_safe; | 3811 | safepos = conf->reshape_safe; |
| 3812 | sector_div(safepos, data_disks); | 3812 | sector_div(safepos, data_disks); |
| 3813 | if (mddev->delta_disks < 0) { | 3813 | if (mddev->delta_disks < 0) { |
| 3814 | writepos -= min(reshape_sectors, writepos); | 3814 | writepos -= min_t(sector_t, reshape_sectors, writepos); |
| 3815 | readpos += reshape_sectors; | 3815 | readpos += reshape_sectors; |
| 3816 | safepos += reshape_sectors; | 3816 | safepos += reshape_sectors; |
| 3817 | } else { | 3817 | } else { |
| 3818 | writepos += reshape_sectors; | 3818 | writepos += reshape_sectors; |
| 3819 | readpos -= min(reshape_sectors, readpos); | 3819 | readpos -= min_t(sector_t, reshape_sectors, readpos); |
| 3820 | safepos -= min(reshape_sectors, safepos); | 3820 | safepos -= min_t(sector_t, reshape_sectors, safepos); |
| 3821 | } | 3821 | } |
| 3822 | 3822 | ||
| 3823 | /* 'writepos' is the most advanced device address we might write. | 3823 | /* 'writepos' is the most advanced device address we might write. |