Commit 22c992e1 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer

dm raid: change rs_set_dev_and_array_sectors API and callers

Add a size argument to rs_set_dev_and_array_sectors as prerequisite
to fixing grown device resynchronization not occuring when new MD
bitmap pages have to be allocated as a result of the extension in
a follwup patch.

Also avoid code duplication by using rs_set_rdev_sectors
in the aforementioned function.
Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 6ba01df7
...@@ -1615,13 +1615,12 @@ static int _check_data_dev_sectors(struct raid_set *rs) ...@@ -1615,13 +1615,12 @@ static int _check_data_dev_sectors(struct raid_set *rs)
} }
/* Calculate the sectors per device and per array used for @rs */ /* Calculate the sectors per device and per array used for @rs */
static int rs_set_dev_and_array_sectors(struct raid_set *rs, bool use_mddev) static int rs_set_dev_and_array_sectors(struct raid_set *rs, sector_t sectors, bool use_mddev)
{ {
int delta_disks; int delta_disks;
unsigned int data_stripes; unsigned int data_stripes;
sector_t array_sectors = sectors, dev_sectors = sectors;
struct mddev *mddev = &rs->md; struct mddev *mddev = &rs->md;
struct md_rdev *rdev;
sector_t array_sectors = rs->ti->len, dev_sectors = rs->ti->len;
if (use_mddev) { if (use_mddev) {
delta_disks = mddev->delta_disks; delta_disks = mddev->delta_disks;
...@@ -1656,12 +1655,9 @@ static int rs_set_dev_and_array_sectors(struct raid_set *rs, bool use_mddev) ...@@ -1656,12 +1655,9 @@ static int rs_set_dev_and_array_sectors(struct raid_set *rs, bool use_mddev)
/* Striped layouts */ /* Striped layouts */
array_sectors = (data_stripes + delta_disks) * dev_sectors; array_sectors = (data_stripes + delta_disks) * dev_sectors;
rdev_for_each(rdev, mddev)
if (!test_bit(Journal, &rdev->flags))
rdev->sectors = dev_sectors;
mddev->array_sectors = array_sectors; mddev->array_sectors = array_sectors;
mddev->dev_sectors = dev_sectors; mddev->dev_sectors = dev_sectors;
rs_set_rdev_sectors(rs);
return _check_data_dev_sectors(rs); return _check_data_dev_sectors(rs);
bad: bad:
...@@ -2911,7 +2907,7 @@ static int rs_setup_reshape(struct raid_set *rs) ...@@ -2911,7 +2907,7 @@ static int rs_setup_reshape(struct raid_set *rs)
/* Remove disk(s) */ /* Remove disk(s) */
} else if (rs->delta_disks < 0) { } else if (rs->delta_disks < 0) {
r = rs_set_dev_and_array_sectors(rs, true); r = rs_set_dev_and_array_sectors(rs, rs->ti->len, true);
mddev->reshape_backwards = 1; /* removing disk(s) -> backward reshape */ mddev->reshape_backwards = 1; /* removing disk(s) -> backward reshape */
/* Change layout and/or chunk size */ /* Change layout and/or chunk size */
...@@ -3067,7 +3063,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) ...@@ -3067,7 +3063,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
* *
* Any existing superblock will overwrite the array and device sizes * Any existing superblock will overwrite the array and device sizes
*/ */
r = rs_set_dev_and_array_sectors(rs, false); r = rs_set_dev_and_array_sectors(rs, rs->ti->len, false);
if (r) if (r)
goto bad; goto bad;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment