Skip to content

Commit 906ad93

Browse files
author
Ming Lei
committed
md: allow removing faulty rdev during resync
JIRA: https://issues.redhat.com/browse/RHEL-106845 commit c0ffeb6 Author: Zheng Qixing <zhengqixing@huawei.com> Date: Mon Jul 7 15:54:12 2025 +0800 md: allow removing faulty rdev during resync During RAID resync, faulty rdev cannot be removed and will result in "Device or resource busy" error when attempting hot removal. Reproduction steps: mdadm -Cv /dev/md0 -l1 -n3 -e1.2 /dev/sd{b..d} mdadm /dev/md0 -f /dev/sdb mdadm /dev/md0 -r /dev/sdb -> mdadm: hot remove failed for /dev/sdb: Device or resource busy After commit 4b10a3b ("md: ensure resync is prioritized over recovery"), when a device becomes faulty during resync, the md_choose_sync_action() function returns early without calling remove_and_add_spares(), preventing faulty device removal. This patch extracts a helper function remove_spares() to support removing faulty devices during RAID resync operations. Fixes: 4b10a3b ("md: ensure resync is prioritized over recovery") Signed-off-by: Zheng Qixing <zhengqixing@huawei.com> Reviewed-by: Li Nan <linan122@huawei.com> Link: https://lore.kernel.org/linux-raid/20250707075412.150301-1-zhengqixing@huaweicloud.com Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent b3c083e commit 906ad93

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

drivers/md/md.c

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9454,17 +9454,11 @@ static bool md_spares_need_change(struct mddev *mddev)
94549454
return false;
94559455
}
94569456

9457-
static int remove_and_add_spares(struct mddev *mddev,
9458-
struct md_rdev *this)
9457+
static int remove_spares(struct mddev *mddev, struct md_rdev *this)
94599458
{
94609459
struct md_rdev *rdev;
9461-
int spares = 0;
94629460
int removed = 0;
94639461

9464-
if (this && test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
9465-
/* Mustn't remove devices when resync thread is running */
9466-
return 0;
9467-
94689462
rdev_for_each(rdev, mddev) {
94699463
if ((this == NULL || rdev == this) && rdev_removeable(rdev) &&
94709464
!mddev->pers->hot_remove_disk(mddev, rdev)) {
@@ -9478,6 +9472,21 @@ static int remove_and_add_spares(struct mddev *mddev,
94789472
if (removed && mddev->kobj.sd)
94799473
sysfs_notify_dirent_safe(mddev->sysfs_degraded);
94809474

9475+
return removed;
9476+
}
9477+
9478+
static int remove_and_add_spares(struct mddev *mddev,
9479+
struct md_rdev *this)
9480+
{
9481+
struct md_rdev *rdev;
9482+
int spares = 0;
9483+
int removed = 0;
9484+
9485+
if (this && test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
9486+
/* Mustn't remove devices when resync thread is running */
9487+
return 0;
9488+
9489+
removed = remove_spares(mddev, this);
94819490
if (this && removed)
94829491
goto no_add;
94839492

@@ -9520,6 +9529,7 @@ static bool md_choose_sync_action(struct mddev *mddev, int *spares)
95209529

95219530
/* Check if resync is in progress. */
95229531
if (mddev->recovery_cp < MaxSector) {
9532+
remove_spares(mddev, NULL);
95239533
set_bit(MD_RECOVERY_SYNC, &mddev->recovery);
95249534
clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery);
95259535
return true;

0 commit comments

Comments
 (0)