diff options
| author | NeilBrown <neilb@suse.de> | 2015-02-15 22:51:54 -0500 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-02-15 22:51:54 -0500 |
| commit | f04ebb0be74283b32f539c7f6b84d5cfcaa0ead3 (patch) | |
| tree | b8eff05bdce7486f714d871436a419e68739dacf /drivers/md | |
| parent | ab713cdc6f70da62c254c4acf77a0cfcda87b7f5 (diff) | |
md/raid10: round up to bdev_logical_block_size in narrow_write_error.
RAID10 version of earlier fix for RAID1. We must never initiate
IO with sizes less that logical_block_size.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid10.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index b8d76b1fba64..a7196c49d15d 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -2572,7 +2572,8 @@ static int narrow_write_error(struct r10bio *r10_bio, int i) | |||
| 2572 | if (rdev->badblocks.shift < 0) | 2572 | if (rdev->badblocks.shift < 0) |
| 2573 | return 0; | 2573 | return 0; |
| 2574 | 2574 | ||
| 2575 | block_sectors = 1 << rdev->badblocks.shift; | 2575 | block_sectors = roundup(1 << rdev->badblocks.shift, |
| 2576 | bdev_logical_block_size(rdev->bdev) >> 9); | ||
| 2576 | sector = r10_bio->sector; | 2577 | sector = r10_bio->sector; |
| 2577 | sectors = ((r10_bio->sector + block_sectors) | 2578 | sectors = ((r10_bio->sector + block_sectors) |
| 2578 | & ~(sector_t)(block_sectors - 1)) | 2579 | & ~(sector_t)(block_sectors - 1)) |