Commit 065e519e authored by NeilBrown's avatar NeilBrown Committed by Shaohua Li

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: default avatarNeilBrown <neilb@suse.com>
Fixes: af8d8e6f ("md: changes for MD_STILL_CLOSED flag")
Cc: stable@vger.kernel.org (v4.9+)
Signed-off-by: default avatarZhilong Liu <zlliu@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 6f287ca6
...@@ -6925,6 +6925,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -6925,6 +6925,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
struct mddev *mddev = NULL; struct mddev *mddev = NULL;
int ro; int ro;
bool did_set_md_closing = false;
if (!md_ioctl_valid(cmd)) if (!md_ioctl_valid(cmd))
return -ENOTTY; return -ENOTTY;
...@@ -7014,7 +7015,9 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -7014,7 +7015,9 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
err = -EBUSY; err = -EBUSY;
goto out; goto out;
} }
WARN_ON_ONCE(test_bit(MD_CLOSING, &mddev->flags));
set_bit(MD_CLOSING, &mddev->flags); set_bit(MD_CLOSING, &mddev->flags);
did_set_md_closing = true;
mutex_unlock(&mddev->open_mutex); mutex_unlock(&mddev->open_mutex);
sync_blockdev(bdev); sync_blockdev(bdev);
} }
...@@ -7207,6 +7210,8 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -7207,6 +7210,8 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
mddev->hold_active = 0; mddev->hold_active = 0;
mddev_unlock(mddev); mddev_unlock(mddev);
out: out:
if(did_set_md_closing)
clear_bit(MD_CLOSING, &mddev->flags);
return err; return err;
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment