md: allow metadata updates while suspending an array - fix (059421e0) · Commits · 戴 / test

Commit ("md: allow metadata update while suspending.") added support for allowing md_check_recovery() to still perform metadata updates while the array is entering the 'suspended' state. This is needed to allow the processes of entering the state to complete. Unfortunately, the patch doesn't really work. The test for "mddev->suspended" at the start of md_check_recovery() means that the function doesn't try to do anything at all while entering suspend. This patch moves the code of updating the metadata while suspending to *before* the test on mddev->suspended. Reported-by:

Jeff Mahoney <jeffm@suse.com> Fixes: ("md: allow metadata update while suspending.") Signed-off-by:

NeilBrown <neilb@suse.com> Signed-off-by:

Shaohua Li <shli@fb.com>

drivers/md/md.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -8794,6 +8794,18 @@ static void md_start_sync(struct work_struct *ws)
		*/
		void md_check_recovery(struct mddev *mddev)
		{
		if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags) && mddev->sb_flags) {
		/* Write superblock - thread that called mddev_suspend()
		* holds reconfig_mutex for us.
		*/
		set_bit(MD_UPDATING_SB, &mddev->flags);
		smp_mb__after_atomic();
		if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags))
		md_update_sb(mddev, 0);
		clear_bit_unlock(MD_UPDATING_SB, &mddev->flags);
		wake_up(&mddev->sb_wait);
		}

		if (mddev->suspended)
		return;

		@@ -8953,16 +8965,6 @@ void md_check_recovery(struct mddev *mddev)
		unlock:
		wake_up(&mddev->sb_wait);
		mddev_unlock(mddev);
		} else if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags) && mddev->sb_flags) {
		/* Write superblock - thread that called mddev_suspend()
		* holds reconfig_mutex for us.
		*/
		set_bit(MD_UPDATING_SB, &mddev->flags);
		smp_mb__after_atomic();
		if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags))
		md_update_sb(mddev, 0);
		clear_bit_unlock(MD_UPDATING_SB, &mddev->flags);
		wake_up(&mddev->sb_wait);
		}
		}
		EXPORT_SYMBOL(md_check_recovery);

Admin message