From: NeilBrown Date: Fri, 17 Jul 2015 01:57:30 +0000 (+1000) Subject: md: set MD_RECOVERY_RECOVER when starting a degraded array. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a4a3d26d8757a30ae21724d8b0d79e00e113c38d;p=openwrt%2Fstaging%2Fblogic.git md: set MD_RECOVERY_RECOVER when starting a degraded array. This ensures that 'sync_action' will show 'recover' immediately the array is started. If there is no spare the status will change to 'idle' once that is detected. Clear MD_RECOVERY_RECOVER for a read-only array to ensure this change happens. This allows scripts which monitor status not to get confused - particularly my test scripts. Signed-off-by: NeilBrown --- diff --git a/drivers/md/md.c b/drivers/md/md.c index 324f9df4e429..5b62a3d49e12 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5218,6 +5218,11 @@ int md_run(struct mddev *mddev) if (sysfs_link_rdev(mddev, rdev)) /* failure here is OK */; + if (mddev->degraded && !mddev->ro) + /* This ensures that recovering status is reported immediately + * via sysfs - until a lack of spares is confirmed. + */ + set_bit(MD_RECOVERY_RECOVER, &mddev->recovery); set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); if (mddev->flags & MD_UPDATE_SB_FLAGS) @@ -8164,6 +8169,7 @@ void md_check_recovery(struct mddev *mddev) */ set_bit(MD_RECOVERY_INTR, &mddev->recovery); md_reap_sync_thread(mddev); + clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery); clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); goto unlock; }