md: test mddev->flags more safely in md_check_recovery.

commit 7a0a535 md: Don't test all of mddev->flags at once. made most tests on mddev->flags safer, but missed one. When commit 260fa03 md: avoid deadlock when dirty buffers during md_stop. added MD_STILL_CLOSED, this caused md_check_recovery to misbehave. It can think there is something to do but find nothing. This can lead to the md thread spinning during array shutdown. https://bugzilla.kernel.org/show_bug.cgi?id=65721 Reported-and-tested-by: Richard W.M. Jones <[email protected]> Fixes: 260fa03 Cc: [email protected] (3.12) Signed-off-by: NeilBrown <[email protected]>
ambv · Nov 28, 2013 · 142d44c · 142d44c
1 parent 0c775d5
commit 142d44c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/md/md.c b/drivers/md/md.c
@@ -7777,7 +7777,7 @@ void md_check_recovery(struct mddev *mddev)
 	if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
 		return;
 	if ( ! (
-		(mddev->flags & ~ (1<<MD_CHANGE_PENDING)) ||
+		(mddev->flags & MD_UPDATE_SB_FLAGS & ~ (1<<MD_CHANGE_PENDING)) ||
 		test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
 		test_bit(MD_RECOVERY_DONE, &mddev->recovery) ||
 		(mddev->external == 0 && mddev->safemode == 1) ||