From: NeilBrown Date: Thu, 2 Jun 2016 06:19:52 +0000 (+1000) Subject: md: disconnect device from personality before trying to remove it. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8430e7e0af9a15063b90343e3beebc164c8e90f3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git md: disconnect device from personality before trying to remove it. When the HOT_REMOVE_DISK ioctl is used to remove a device, we call remove_and_add_spares() which will remove it from the personality if possible. This improves the chances that the removal will succeed. When writing "remove" to dev-XX/state, we don't. So that can fail more easily. So add the remove_and_add_spares() into "remove" handling. Signed-off-by: NeilBrown Signed-off-by: Shaohua Li --- diff --git a/drivers/md/md.c b/drivers/md/md.c index d0c1e79da49e..0793754eeffd 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2595,6 +2595,8 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) else err = -EBUSY; } else if (cmd_match(buf, "remove")) { + clear_bit(Blocked, &rdev->flags); + remove_and_add_spares(rdev->mddev, rdev); if (rdev->raid_disk >= 0) err = -EBUSY; else {