From e101108af8781c16661bc4ad4328178fe1e71ab6 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 26 May 2009 12:57:21 +1000 Subject: [PATCH] --- yaml --- r: 145254 b: refs/heads/master c: 7a91ee1f628ef6bfe3f13067c0ddf9db520cb86b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 270d744ed1cb..d16bab3082c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 848b3182365fdf5a05bcd5ed949071cac2c894b3 +refs/heads/master: 7a91ee1f628ef6bfe3f13067c0ddf9db520cb86b diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 384e4f0904c8..954456532acc 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -6362,12 +6362,13 @@ void md_do_sync(mddev_t *mddev) skipped = 0; - if ((mddev->curr_resync > mddev->curr_resync_completed && - (mddev->curr_resync - mddev->curr_resync_completed) - > (max_sectors >> 4)) || - (j - mddev->curr_resync_completed)*2 - >= mddev->resync_max - mddev->curr_resync_completed - ) { + if (!test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && + ((mddev->curr_resync > mddev->curr_resync_completed && + (mddev->curr_resync - mddev->curr_resync_completed) + > (max_sectors >> 4)) || + (j - mddev->curr_resync_completed)*2 + >= mddev->resync_max - mddev->curr_resync_completed + )) { /* time to update curr_resync_completed */ blk_unplug(mddev->queue); wait_event(mddev->recovery_wait,