adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://neil.brown.name/md

Browse source 
* 'for-linus' of git://neil.brown.name/md:
  md: raid5: change incorrect usage of 'min' macro to 'min_t'
This commit is contained in:
Linus Torvalds 2009-05-27 10:18:26 -07:00
commit 54726f14b5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/md/raid5.c
View file

@ -3811,13 +3811,13 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
safepos = conf->reshape_safe; safepos = conf->reshape_safe;
sector_div(safepos, data_disks); sector_div(safepos, data_disks);
if (mddev->delta_disks < 0) { if (mddev->delta_disks < 0) {
writepos -= min(reshape_sectors, writepos); writepos -= min_t(sector_t, reshape_sectors, writepos);
readpos += reshape_sectors; readpos += reshape_sectors;
safepos += reshape_sectors; safepos += reshape_sectors;
} else { } else {
writepos += reshape_sectors; writepos += reshape_sectors;
readpos -= min(reshape_sectors, readpos); readpos -= min_t(sector_t, reshape_sectors, readpos);
safepos -= min(reshape_sectors, safepos); safepos -= min_t(sector_t, reshape_sectors, safepos);
} }
/* 'writepos' is the most advanced device address we might write. /* 'writepos' is the most advanced device address we might write.