]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
md: MD_RECOVERY_NEEDED is set for mddev->recovery
authorShaohua Li <shli@fb.com>
Thu, 8 Dec 2016 23:48:18 +0000 (15:48 -0800)
committerShaohua Li <shli@fb.com>
Fri, 9 Dec 2016 06:00:43 +0000 (22:00 -0800)
Fixes: 90f5f7ad4f38("md: Wait for md_check_recovery before attempting device
removal.")

Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
drivers/md/md.c

index 84dc8913d13b96704fcd234573fcb8bdb578a5f3..5e666482db3c4d927255930dbb8cd85acb1f7877 100644 (file)
@@ -6856,7 +6856,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
                /* need to ensure recovery thread has run */
                wait_event_interruptible_timeout(mddev->sb_wait,
                                                 !test_bit(MD_RECOVERY_NEEDED,
-                                                          &mddev->flags),
+                                                          &mddev->recovery),
                                                 msecs_to_jiffies(5000));
        if (cmd == STOP_ARRAY || cmd == STOP_ARRAY_RO) {
                /* Need to flush page cache, and ensure no-one else opens