diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-08-07 10:02:47 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2008-08-07 10:02:47 -0700 |
| commit | 56ac36d722d0d27c03599d1245ac0ab59e474e5c (patch) | |
| tree | e65f4d860549532a570b92995906f3c3dec9c529 /drivers/md | |
| parent | 0310fa216decc3ecfab41f327638fa48a81f3735 (diff) | |
| download | linux-56ac36d722d0d27c03599d1245ac0ab59e474e5c.tar.gz linux-56ac36d722d0d27c03599d1245ac0ab59e474e5c.tar.bz2 linux-56ac36d722d0d27c03599d1245ac0ab59e474e5c.zip | |
md: cancel check/repair requests when recovery is needed
If a 'repair' is requested when an array is in a position to 'recover' raid1
will perform the repair while md believes a recovery is happening. Address
this at both ends, i.e. cancel check/repair requests upon detecting a
recover condition and do not call ->spare_active after completing a
check/repair.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 25b893ec562e..8cfadc5bd2ba 100644 --- a/drivers/md/md.c +++ b/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); |