diff options
| author | NeilBrown <neilb@suse.de> | 2013-11-27 23:34:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 19:05:54 (GMT) |
| commit | 52df633c9c9c92264e04e1ead9290e5192a8768e (patch) | |
| tree | c04de351cbced0480922024083d690da860f7c0e /drivers/md | |
| parent | 2501e938cf2350ca719e423b3aa30e7303805b7c (diff) | |
| download | linux-fsl-qoriq-52df633c9c9c92264e04e1ead9290e5192a8768e.tar.xz | |
md: test mddev->flags more safely in md_check_recovery.
commit 142d44c310819e1965ca70b4d55d7679f5797e25 upstream.
commit 7a0a5355cbc71efa md: Don't test all of mddev->flags at once.
made most tests on mddev->flags safer, but missed one.
When
commit 260fa034ef7a4ff8b7306 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 <rjones@redhat.com>
Fixes: 260fa034ef7a4ff8b7306
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index fbe9ffd..ba46d97 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7792,7 +7792,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) || |