Commit cfa078c8 authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

md: use new apis to suspend array for adding/removing rdev from state_store()

User can write 'remove' and 're-add' to trigger array reconfiguration
through sysfs, suspend array in this case so that io won't concurrent
with array reconfiguration.

And now that all the caller of add_bound_rdev() alread suspend the
array, remove mddev_suspend/resume() from add_bound_rdev() as well.
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20231010151958.145896-12-yukuai1@huaweicloud.com
parent 205669f3
...@@ -2940,11 +2940,7 @@ static int add_bound_rdev(struct md_rdev *rdev) ...@@ -2940,11 +2940,7 @@ static int add_bound_rdev(struct md_rdev *rdev)
*/ */
super_types[mddev->major_version]. super_types[mddev->major_version].
validate_super(mddev, rdev); validate_super(mddev, rdev);
if (add_journal)
mddev_suspend(mddev);
err = mddev->pers->hot_add_disk(mddev, rdev); err = mddev->pers->hot_add_disk(mddev, rdev);
if (add_journal)
mddev_resume(mddev);
if (err) { if (err) {
md_kick_rdev_from_array(rdev); md_kick_rdev_from_array(rdev);
return err; return err;
...@@ -3697,6 +3693,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, ...@@ -3697,6 +3693,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,
struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr); struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr);
struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj); struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj);
struct kernfs_node *kn = NULL; struct kernfs_node *kn = NULL;
bool suspend = false;
ssize_t rv; ssize_t rv;
struct mddev *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
...@@ -3704,17 +3701,23 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, ...@@ -3704,17 +3701,23 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,
return -EIO; return -EIO;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EACCES; return -EACCES;
if (!mddev)
return -ENODEV;
if (entry->store == state_store && cmd_match(page, "remove")) if (entry->store == state_store) {
if (cmd_match(page, "remove"))
kn = sysfs_break_active_protection(kobj, attr); kn = sysfs_break_active_protection(kobj, attr);
if (cmd_match(page, "remove") || cmd_match(page, "re-add"))
suspend = true;
}
rv = mddev ? mddev_lock(mddev) : -ENODEV; rv = suspend ? mddev_suspend_and_lock(mddev) : mddev_lock(mddev);
if (!rv) { if (!rv) {
if (rdev->mddev == NULL) if (rdev->mddev == NULL)
rv = -ENODEV; rv = -ENODEV;
else else
rv = entry->store(rdev, page, length); rv = entry->store(rdev, page, length);
mddev_unlock(mddev); suspend ? mddev_unlock_and_resume(mddev) : mddev_unlock(mddev);
} }
if (kn) if (kn)
......
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