From e19180dc963c59f5aad55694958563b8cc0c1fcc Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 21 May 2012 09:28:33 +1000 Subject: [PATCH] --- yaml --- r: 305919 b: refs/heads/master c: c804cdecea418c067ee7359d62139b2b3c8cec39 h: refs/heads/master i: 305917: 4d19f90ef703e1ea2cc28209ff6b594a95cb87df 305915: 11ae43b422142ab4900be6bb9a626de73f2ca233 305911: ca7f9c96de0ae2d22f0371c1d2a254561bd8ef67 305903: 1f02dfd9ac1aedac303d66f00a01a0d75bd86e38 305887: a89f2b30f88e4cc483c288b1f8c4aecae1918fc4 305855: 9128122ccb9a5302815a4254e28b1d661c93d3b6 305791: 3a313283351a79c29b0ebfc080a219327e937d4f 305663: 5482f565345a57097cb1b9d041e4ec2809a0e671 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 032a05d0e205..866cc15a6ee6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fdd6fc92f330b81604c9a4f892f713775a9751a +refs/heads/master: c804cdecea418c067ee7359d62139b2b3c8cec39 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index c6b8d9fd0b04..8fe1abf1b89c 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -4425,7 +4425,8 @@ sync_completed_show(struct mddev *mddev, char *page) if (!test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) return sprintf(page, "none\n"); - if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) + if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || + test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) max_sectors = mddev->resync_max_sectors; else max_sectors = mddev->dev_sectors; @@ -6803,7 +6804,8 @@ static void status_resync(struct seq_file *seq, struct mddev * mddev) resync = mddev->curr_resync - atomic_read(&mddev->recovery_active); - if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) + if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || + test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) max_sectors = mddev->resync_max_sectors; else max_sectors = mddev->dev_sectors; @@ -7366,7 +7368,7 @@ void md_do_sync(struct mddev *mddev) j = mddev->recovery_cp; } else if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) - max_sectors = mddev->dev_sectors; + max_sectors = mddev->resync_max_sectors; else { /* recovery follows the physical size of devices */ max_sectors = mddev->dev_sectors;