Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56ac36d7 authored by Dan Williams's avatar Dan Williams
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
parent 0310fa21

drivers/md/md.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -6138,7 +6138,8 @@ void md_check_recovery(mddev_t *mddev) 
			/* resync has finished, collect result */

			/* resync has finished, collect result */

			md_unregister_thread(mddev->sync_thread);

			md_unregister_thread(mddev->sync_thread);

			mddev->sync_thread = NULL;

			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...*/

				/* success...*/

				/* activate any spares */

				/* activate any spares */

				if (mddev->pers->spare_active(mddev))

				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))) {

		} else if ((spares = remove_and_add_spares(mddev))) {

			clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);

			clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);

			clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);

			clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);

			clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);

			set_bit(MD_RECOVERY_RECOVER, &mddev->recovery);

			set_bit(MD_RECOVERY_RECOVER, &mddev->recovery);

		} else if (mddev->recovery_cp < MaxSector) {

		} else if (mddev->recovery_cp < MaxSector) {

			set_bit(MD_RECOVERY_SYNC, &mddev->recovery);

			set_bit(MD_RECOVERY_SYNC, &mddev->recovery);