No need to calculate the reshaping progress because mddev->curr_resync_completed holds it.
Signed-off-by: Heinz Mauelshagen <[email protected]> --- drivers/md/dm-raid.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index f5db4ce69d6b..41a411526b27 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3399,26 +3399,9 @@ static sector_t rs_get_progress(struct raid_set *rs, unsigned long recovery, set_bit(RT_FLAG_RS_IN_SYNC, &rs->runtime_flags); } else { - /* Reshape is relative to the array size */ - if (test_bit(MD_RECOVERY_RESHAPE, &recovery)) { - r = mddev->reshape_position; - if (r != MaxSector) { - /* Got to reverse on backward reshape */ - if (mddev->reshape_backwards) - r = mddev->array_sectors - r; - - /* Divide by # of data stripes unless raid1 */ - if (!rs_is_raid1(rs)) - sector_div(r, mddev_data_stripes(rs)); - } - - /* - * Sync/recover is relative to the component device size. - * - * MD_RECOVERY_NEEDED for https://bugzilla.redhat.com/show_bug.cgi?id=1508070 - */ - } else if (test_bit(MD_RECOVERY_NEEDED, &recovery) || - test_bit(MD_RECOVERY_RUNNING, &recovery)) + if (test_bit(MD_RECOVERY_NEEDED, &recovery) || + test_bit(MD_RECOVERY_RESHAPE, &recovery) || + test_bit(MD_RECOVERY_RUNNING, &recovery)) r = mddev->curr_resync_completed; else r = mddev->recovery_cp; -- 2.13.6 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
