iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md/raid1: round up to bdev_logical_block_size in narrow_write_error

Browse Source 
This modifies raid1's narrow_write_error to round up block_sectors to the
device's logical block size.

This prevents sd complaining about "Bad block number requested" for non-512-byte
sector disks.

Signed-off-by: Nate Dailey <nate.dailey@stratus.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Nate Dailey 2015-02-12 12:02:09 -05:00 committed by NeilBrown
parent 53a6ab4d3f
commit ab713cdc6f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/md/raid1.c
View File

@ -2196,7 +2196,8 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)
if (rdev->badblocks.shift < 0) if (rdev->badblocks.shift < 0)
return 0; return 0;
block_sectors = 1 << rdev->badblocks.shift; block_sectors = roundup(1 << rdev->badblocks.shift,
bdev_logical_block_size(rdev->bdev) >> 9);
sector = r1_bio->sector; sector = r1_bio->sector;
sectors = ((sector + block_sectors) sectors = ((sector + block_sectors)
& ~(sector_t)(block_sectors - 1)) & ~(sector_t)(block_sectors - 1))