md: fix two bugs when attempting to resize RAID0 array.
You cannot resize a RAID0 array (in terms of making the devices bigger), but the code doesn't entirely stop you. So: disable setting of the available size on each device for RAID0 and Linear devices. This must not change as doing so can change the effective layout of data. Make sure that the size that raid0_size() reports is accurate, but rounding devices sizes to chunk sizes. As the device sizes cannot change now, this isn't so important, but it is best to be safe. Without this change: mdadm --grow /dev/md0 -z max mdadm --grow /dev/md0 -Z max then read to the end of the array can cause a BUG in a RAID0 array. These bugs have been present ever since it became possible to resize any device, which is a long time. So the fix is suitable for any -stable kerenl. Cc: stable@vger.kernel.org Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
fe5d2f4a15
commit
a646853991
|
@ -2998,6 +2998,9 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len)
|
||||||
} else if (!sectors)
|
} else if (!sectors)
|
||||||
sectors = (i_size_read(rdev->bdev->bd_inode) >> 9) -
|
sectors = (i_size_read(rdev->bdev->bd_inode) >> 9) -
|
||||||
rdev->data_offset;
|
rdev->data_offset;
|
||||||
|
if (!my_mddev->pers->resize)
|
||||||
|
/* Cannot change size for RAID0 or Linear etc */
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (sectors < my_mddev->dev_sectors)
|
if (sectors < my_mddev->dev_sectors)
|
||||||
return -EINVAL; /* component must fit device */
|
return -EINVAL; /* component must fit device */
|
||||||
|
|
|
@ -411,7 +411,8 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
|
||||||
"%s does not support generic reshape\n", __func__);
|
"%s does not support generic reshape\n", __func__);
|
||||||
|
|
||||||
rdev_for_each(rdev, mddev)
|
rdev_for_each(rdev, mddev)
|
||||||
array_sectors += rdev->sectors;
|
array_sectors += (rdev->sectors &
|
||||||
|
~(sector_t)(mddev->chunk_sectors-1));
|
||||||
|
|
||||||
return array_sectors;
|
return array_sectors;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue