From 33824ce14272930c4b13d4eb43617ca3c96f9677 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 7 Aug 2008 10:02:47 -0700 Subject: [PATCH] --- yaml --- r: 108527 b: refs/heads/master c: 56ac36d722d0d27c03599d1245ac0ab59e474e5c h: refs/heads/master i: 108525: 4e56282b596f2d00ca82d242b206e88dff4365ea 108523: 8e30ce39cd6c3430005f025b05010874eb0f2704 108519: e012ed1d11fc7e14cab767fe15bf38c08f8f7cb5 108511: e87772a8b7eeb8e940572a0ed682345c5e8449ee v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b2534b223911..49bbe8cd5183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0310fa216decc3ecfab41f327638fa48a81f3735 +refs/heads/master: 56ac36d722d0d27c03599d1245ac0ab59e474e5c diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 25b893ec562e..8cfadc5bd2ba 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -6138,7 +6138,8 @@ void md_check_recovery(mddev_t *mddev) /* resync has finished, collect result */ md_unregister_thread(mddev->sync_thread); mddev->sync_thread = NULL; - if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { + if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) && + !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { /* success...*/ /* activate any spares */ if (mddev->pers->spare_active(mddev)) @@ -6190,6 +6191,7 @@ void md_check_recovery(mddev_t *mddev) } else if ((spares = remove_and_add_spares(mddev))) { clear_bit(MD_RECOVERY_SYNC, &mddev->recovery); clear_bit(MD_RECOVERY_CHECK, &mddev->recovery); + clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery); set_bit(MD_RECOVERY_RECOVER, &mddev->recovery); } else if (mddev->recovery_cp < MaxSector) { set_bit(MD_RECOVERY_SYNC, &mddev->recovery);