md: Always set RECOVERY_NEEDED when clearing RECOVERY_FROZEN (45eaf45d) · Commits · 戴 / test

md_check_recovery will skip any recovery and also clear MD_RECOVERY_NEEDED if MD_RECOVERY_FROZEN is set. So when we clear _FROZEN, we must set _NEEDED and ensure that md_check_recovery gets run. Otherwise we could miss out on something that is needed. In particular, this can make it impossible to remove a failed device from an array is the 'recovery-needed' processing didn't happen. Suitable for stable kernels since 3.13. Cc: stable@vger.kernel.org (3.13+) Reported-and-tested-by:

Joe Lawrence <joe.lawrence@stratus.com> Fixes: Signed-off-by:

NeilBrown <neilb@suse.de>

drivers/md/md.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -5121,6 +5121,7 @@ static int md_set_readonly(struct mddev mddev, struct block_device bdev)
		printk("md: %s still in use.\n",mdname(mddev));
		if (did_freeze) {
		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
		md_wakeup_thread(mddev->thread);
		}
		err = -EBUSY;
		@@ -5135,6 +5136,8 @@ static int md_set_readonly(struct mddev mddev, struct block_device bdev)
		mddev->ro = 1;
		set_disk_ro(mddev->gendisk, 1);
		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
		md_wakeup_thread(mddev->thread);
		sysfs_notify_dirent_safe(mddev->sysfs_state);
		err = 0;
		}
		@@ -5178,6 +5181,7 @@ static int do_md_stop(struct mddev *mddev, int mode,
		mutex_unlock(&mddev->open_mutex);
		if (did_freeze) {
		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
		md_wakeup_thread(mddev->thread);
		}
		return -EBUSY;

Admin message