Commit 2527b56e authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer

dm raid: add comments and fix typos

Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent fbe6365b
...@@ -1618,7 +1618,6 @@ static int rs_check_takeover(struct raid_set *rs) ...@@ -1618,7 +1618,6 @@ static int rs_check_takeover(struct raid_set *rs)
/* raid1 -> raid10 */ /* raid1 -> raid10 */
if (mddev->new_level == 10) if (mddev->new_level == 10)
return 0; return 0;
break; break;
case 4: case 4:
...@@ -2424,8 +2423,8 @@ static int rs_adjust_data_offsets(struct raid_set *rs) ...@@ -2424,8 +2423,8 @@ static int rs_adjust_data_offsets(struct raid_set *rs)
* data is at offset rs->data_offset != 0 and * data is at offset rs->data_offset != 0 and
* free space is at begin of each component LV * free space is at begin of each component LV
* *
* - after reshape: data is at offset 0 if i was at offset != 0 * - after reshape: data is at offset 0 if it was at offset != 0
* of at offset != 0 if it was at offset 0 * or at offset != 0 if it was at offset 0
* on each component LV * on each component LV
* *
*/ */
...@@ -2731,6 +2730,12 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) ...@@ -2731,6 +2730,12 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv)
rs->md.sync_super = super_sync; rs->md.sync_super = super_sync;
/*
* Calculate ctr requested array and device sizes to allow
* for superblock analysis needing device sizes defined.
*
* 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, false);
if (r) if (r)
return r; return r;
...@@ -2781,8 +2786,9 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) ...@@ -2781,8 +2786,9 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv)
} }
/* /*
* If a takeover is needed, just set the level to * If a takeover is needed, userspace sets any additional
* the new requested one and allow the raid set to run. * devices to rebuild, so just set the level to the new
* requested one and allow the raid set to run
*/ */
r = rs_check_takeover(rs); r = rs_check_takeover(rs);
if (r) if (r)
...@@ -2845,7 +2851,7 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) ...@@ -2845,7 +2851,7 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv)
} }
if (rs->md.raid_disks < rs->raid_disks) if (rs->md.raid_disks < rs->raid_disks)
set_bit(MD_ARRAY_FIRST_USE, &rs->md.flags); set_bit(MD_ARRAY_FIRST_USE, &mddev->flags);
rs_set_cur(rs); rs_set_cur(rs);
rs_setup_recovery(rs, MaxSector); rs_setup_recovery(rs, MaxSector);
...@@ -2935,7 +2941,7 @@ static int raid_map(struct dm_target *ti, struct bio *bio) ...@@ -2935,7 +2941,7 @@ static int raid_map(struct dm_target *ti, struct bio *bio)
* mddev->array_sectors will differ during the process * mddev->array_sectors will differ during the process
* (ti->len > mddev->array_sectors), so we have to requeue * (ti->len > mddev->array_sectors), so we have to requeue
* bios with addresses > mddev->array_sectors here or * bios with addresses > mddev->array_sectors here or
* or there will occur accesses past EOD of the component * there will occur accesses past EOD of the component
* data images thus erroring the raid set. * data images thus erroring the raid set.
*/ */
if (unlikely(bio_end_sector(bio) > mddev->array_sectors)) if (unlikely(bio_end_sector(bio) > mddev->array_sectors))
......
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