[RFC PATCH 3/5] md: simplify sync action print in status_resync
Zheng Qixing <[email protected]>
| Newsgroups | gmane.linux.raid,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
From: Zheng Qixing <[email protected]> No functional change, just code cleanup to make it easier to add new sync actions later. Signed-off-by: Zheng Qixing <[email protected]> --- drivers/md/md.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 52e09a9a9288..9eeab5258189 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8684,6 +8684,8 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev) sector_t rt, curr_mark_cnt, resync_mark_cnt; int scale, recovery_active; unsigned int per_milli; + enum sync_action action; + const char *sync_action_name; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) @@ -8765,13 +8767,13 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev) seq_printf(seq, "."); seq_printf(seq, "] "); } - seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)", - (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)? - "reshape" : - (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)? - "check" : - (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? - "resync" : "recovery"))), + + action = md_sync_action(mddev); + if (action == ACTION_RECOVER) + sync_action_name = "recovery"; + else + sync_action_name = md_sync_action_name(action); + seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)", sync_action_name, per_milli/10, per_milli % 10, (unsigned long long) resync/2, (unsigned long long) max_sectors/2); -- 2.39.2