|
@@ -5434,7 +5434,7 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok)
|
|
|
atomic_sub(blocks, &mddev->recovery_active);
|
|
|
wake_up(&mddev->recovery_wait);
|
|
|
if (!ok) {
|
|
|
- set_bit(MD_RECOVERY_ERR, &mddev->recovery);
|
|
|
+ set_bit(MD_RECOVERY_INTR, &mddev->recovery);
|
|
|
md_wakeup_thread(mddev->thread);
|
|
|
// stop recovery, signal do_sync ....
|
|
|
}
|
|
@@ -5690,7 +5690,7 @@ void md_do_sync(mddev_t *mddev)
|
|
|
sectors = mddev->pers->sync_request(mddev, j, &skipped,
|
|
|
currspeed < speed_min(mddev));
|
|
|
if (sectors == 0) {
|
|
|
- set_bit(MD_RECOVERY_ERR, &mddev->recovery);
|
|
|
+ set_bit(MD_RECOVERY_INTR, &mddev->recovery);
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -5713,8 +5713,7 @@ void md_do_sync(mddev_t *mddev)
|
|
|
|
|
|
last_check = io_sectors;
|
|
|
|
|
|
- if (test_bit(MD_RECOVERY_INTR, &mddev->recovery) ||
|
|
|
- test_bit(MD_RECOVERY_ERR, &mddev->recovery))
|
|
|
+ if (test_bit(MD_RECOVERY_INTR, &mddev->recovery))
|
|
|
break;
|
|
|
|
|
|
repeat:
|
|
@@ -5768,8 +5767,7 @@ void md_do_sync(mddev_t *mddev)
|
|
|
/* tell personality that we are finished */
|
|
|
mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);
|
|
|
|
|
|
- if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&
|
|
|
- !test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&
|
|
|
+ if (!test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&
|
|
|
mddev->curr_resync > 2) {
|
|
|
if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
|
|
|
if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
|
|
@@ -5838,7 +5836,10 @@ static int remove_and_add_spares(mddev_t *mddev)
|
|
|
}
|
|
|
|
|
|
if (mddev->degraded) {
|
|
|
- rdev_for_each(rdev, rtmp, mddev)
|
|
|
+ rdev_for_each(rdev, rtmp, mddev) {
|
|
|
+ if (rdev->raid_disk >= 0 &&
|
|
|
+ !test_bit(In_sync, &rdev->flags))
|
|
|
+ spares++;
|
|
|
if (rdev->raid_disk < 0
|
|
|
&& !test_bit(Faulty, &rdev->flags)) {
|
|
|
rdev->recovery_offset = 0;
|
|
@@ -5856,6 +5857,7 @@ static int remove_and_add_spares(mddev_t *mddev)
|
|
|
} else
|
|
|
break;
|
|
|
}
|
|
|
+ }
|
|
|
}
|
|
|
return spares;
|
|
|
}
|
|
@@ -5869,7 +5871,7 @@ static int remove_and_add_spares(mddev_t *mddev)
|
|
|
* to do that as needed.
|
|
|
* When it is determined that resync is needed, we set MD_RECOVERY_RUNNING in
|
|
|
* "->recovery" and create a thread at ->sync_thread.
|
|
|
- * When the thread finishes it sets MD_RECOVERY_DONE (and might set MD_RECOVERY_ERR)
|
|
|
+ * When the thread finishes it sets MD_RECOVERY_DONE
|
|
|
* and wakeups up this thread which will reap the thread and finish up.
|
|
|
* This thread also removes any faulty devices (with nr_pending == 0).
|
|
|
*
|
|
@@ -5944,8 +5946,7 @@ 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_ERR, &mddev->recovery) &&
|
|
|
- !test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
|
|
|
+ if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
|
|
|
/* success...*/
|
|
|
/* activate any spares */
|
|
|
mddev->pers->spare_active(mddev);
|
|
@@ -5969,7 +5970,6 @@ void md_check_recovery(mddev_t *mddev)
|
|
|
* might be left set
|
|
|
*/
|
|
|
clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
|
|
|
- clear_bit(MD_RECOVERY_ERR, &mddev->recovery);
|
|
|
clear_bit(MD_RECOVERY_INTR, &mddev->recovery);
|
|
|
clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
|
|
|
|