Commit a9720903 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Goldwyn Rodrigues

md-cluster: only call kick_rdev_from_array after remove disk successfully

For cluster raid, we should not kick it from array if the disk can't be
remove from array successfully.
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
parent 86b57277
...@@ -2548,13 +2548,16 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) ...@@ -2548,13 +2548,16 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
err = -EBUSY; err = -EBUSY;
else { else {
struct mddev *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
err = 0;
if (mddev_is_clustered(mddev)) if (mddev_is_clustered(mddev))
md_cluster_ops->remove_disk(mddev, rdev); err = md_cluster_ops->remove_disk(mddev, rdev);
if (err == 0) {
md_kick_rdev_from_array(rdev); md_kick_rdev_from_array(rdev);
if (mddev->pers) if (mddev->pers)
md_update_sb(mddev, 1); md_update_sb(mddev, 1);
md_new_event(mddev); md_new_event(mddev);
err = 0; }
} }
} else if (cmd_match(buf, "writemostly")) { } else if (cmd_match(buf, "writemostly")) {
set_bit(WriteMostly, &rdev->flags); set_bit(WriteMostly, &rdev->flags);
......
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