aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2005-11-09 00:39:41 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:39 -0500
commit8e1b39d623359e5ef7983a2bd0fb676be45cba31 (patch)
tree554e7654fbd3aac78bc1f538474100a73de3fdd7 /drivers/md
parent411036fa1924f5e5b0f7f9d04ae5d8cdc72fb839 (diff)
[PATCH] md: only try to print recovery/resync status for personalities that support recovery
The introduction of 'resync=PENDING' (for read-only devices) caused that message to appear for non-syncable arrays like raid0 and linear. Simplest thing is to not try to print any resync info unless the personality clearly supports it. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/md.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 292dad31d5e5..47b8685d4bdf 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3722,13 +3722,15 @@ static int md_seq_show(struct seq_file *seq, void *v)
3722 if (mddev->pers) { 3722 if (mddev->pers) {
3723 mddev->pers->status (seq, mddev); 3723 mddev->pers->status (seq, mddev);
3724 seq_printf(seq, "\n "); 3724 seq_printf(seq, "\n ");
3725 if (mddev->curr_resync > 2) { 3725 if (mddev->pers->sync_request) {
3726 status_resync (seq, mddev); 3726 if (mddev->curr_resync > 2) {
3727 seq_printf(seq, "\n "); 3727 status_resync (seq, mddev);
3728 } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2) 3728 seq_printf(seq, "\n ");
3729 seq_printf(seq, "\tresync=DELAYED\n "); 3729 } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2)
3730 else if (mddev->recovery_cp < MaxSector) 3730 seq_printf(seq, "\tresync=DELAYED\n ");
3731 seq_printf(seq, "\tresync=PENDING\n "); 3731 else if (mddev->recovery_cp < MaxSector)
3732 seq_printf(seq, "\tresync=PENDING\n ");
3733 }
3732 } else 3734 } else
3733 seq_printf(seq, "\n "); 3735 seq_printf(seq, "\n ");
3734 3736