Commit ab713cdc authored Feb 12, 2015 by Nate Dailey Committed by NeilBrown Feb 16, 2015

md/raid1: round up to bdev_logical_block_size in narrow_write_error



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>

parent 53a6ab4d

drivers/md/raid1.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2196,7 +2196,8 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)
		if (rdev->badblocks.shift < 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;
		sectors = ((sector + block_sectors)
		& ~(sector_t)(block_sectors - 1))