diff options
| author | Nate Dailey <nate.dailey@stratus.com> | 2015-02-12 12:02:09 -0500 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-02-16 14:49:26 +1100 |
| commit | ab713cdc6f70da62c254c4acf77a0cfcda87b7f5 (patch) | |
| tree | ec235d733d5b52006e31343e79acede6c2578f8b | |
| parent | 53a6ab4d3f6d6dc87ec8f14998b4b5536ee2968c (diff) | |
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>
| -rw-r--r-- | drivers/md/raid1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 5dd0c2e59ab9..4153da5d4011 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -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)) |