From: NeilBrown Date: Fri, 9 Sep 2005 23:23:59 +0000 (-0700) Subject: [PATCH] md: use queue_hardsect_size instead of block_size for md superblock size... X-Git-Tag: v2.6.14-rc1~232 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=720a3dc39b030e273bc955641f2517874fd38fc5;p=linux-2.6-omap-h63xx.git [PATCH] md: use queue_hardsect_size instead of block_size for md superblock size calc. Doh. I want the physical hard-sector-size, not the current block size... Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/md.c b/drivers/md/md.c index fd66c395894..39b917bc0fc 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -898,7 +898,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) rdev->data_offset = le64_to_cpu(sb->data_offset); rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; - bmask = block_size(rdev->bdev)-1; + bmask = queue_hardsect_size(rdev->bdev->bd_disk->queue)-1; if (rdev->sb_size & bmask) rdev-> sb_size = (rdev->sb_size | bmask)+1;