diff options
| author | NeilBrown <[email protected]> | 2017-04-06 11:16:33 +0800 |
|---|---|---|
| committer | Shaohua Li <[email protected]> | 2017-04-10 10:47:50 -0700 |
| commit | 065e519e71b2c1f41936cce75b46b5ab34adb588 (patch) | |
| tree | b5319795c0ae9aa20c0bae916b2d13f8a6f384be | |
| parent | 6f287ca6046edd34ed83aafb7f9033c9c2e809e2 (diff) | |
md: MD_CLOSING needs to be cleared after called md_set_readonly or do_md_stop
if called md_set_readonly and set MD_CLOSING bit, the mddev cannot
be opened any more due to the MD_CLOING bit wasn't cleared. Thus it
needs to be cleared in md_ioctl after any call to md_set_readonly()
or do_md_stop().
Signed-off-by: NeilBrown <[email protected]>
Fixes: af8d8e6f0315 ("md: changes for MD_STILL_CLOSED flag")
Cc: [email protected] (v4.9+)
Signed-off-by: Zhilong Liu <[email protected]>
Signed-off-by: Shaohua Li <[email protected]>
| -rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 1db88d79549a..a612b9f83069 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6925,6 +6925,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, void __user *argp = (void __user *)arg; struct mddev *mddev = NULL; int ro; + bool did_set_md_closing = false; if (!md_ioctl_valid(cmd)) return -ENOTTY; @@ -7014,7 +7015,9 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, err = -EBUSY; goto out; } + WARN_ON_ONCE(test_bit(MD_CLOSING, &mddev->flags)); set_bit(MD_CLOSING, &mddev->flags); + did_set_md_closing = true; mutex_unlock(&mddev->open_mutex); sync_blockdev(bdev); } @@ -7207,6 +7210,8 @@ unlock: mddev->hold_active = 0; mddev_unlock(mddev); out: + if(did_set_md_closing) + clear_bit(MD_CLOSING, &mddev->flags); return err; } #ifdef CONFIG_COMPAT |