Messages in this thread Patch in this message | | | From | Yu Kuai <> | Subject | [PATCH -next 05/13] md: factor out a helper hot_remove_rdev() from remove_and_add_spares() | Date | Thu, 3 Aug 2023 21:24:18 +0800 |
| |
From: Yu Kuai <yukuai3@huawei.com>
There are no functional changes, just to make the code simpler and prepare to refactor remove_and_add_spares().
Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- drivers/md/md.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8017371a9e53..74ee31f2706b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9179,6 +9179,23 @@ static bool rdev_is_spare(struct md_rdev *rdev) !test_bit(Faulty, &rdev->flags); } +static bool hot_remove_rdev(struct md_rdev *rdev) +{ + struct mddev *mddev; + + if (!rdev_removeable(rdev)) + return false; + + mddev = rdev->mddev; + if (mddev->pers->hot_remove_disk(mddev, rdev)) + return false; + + sysfs_unlink_rdev(mddev, rdev); + rdev->saved_raid_disk = rdev->raid_disk; + rdev->raid_disk = -1; + return true; +} + static int remove_and_add_spares(struct mddev *mddev, struct md_rdev *this) { @@ -9190,15 +9207,9 @@ static int remove_and_add_spares(struct mddev *mddev, /* Mustn't remove devices when resync thread is running */ return 0; - rdev_for_each(rdev, mddev) { - if ((this == NULL || rdev == this) && rdev_removeable(rdev) && - !mddev->pers->hot_remove_disk(mddev, rdev)) { - sysfs_unlink_rdev(mddev, rdev); - rdev->saved_raid_disk = rdev->raid_disk; - rdev->raid_disk = -1; + rdev_for_each(rdev, mddev) + if ((this == NULL || rdev == this) && hot_remove_rdev(rdev)) removed++; - } - } if (removed && mddev->kobj.sd) sysfs_notify_dirent_safe(mddev->sysfs_degraded); -- 2.39.2
| |