* [PATCH V2] MD: fix info output for journal disk
@ 2015-10-12 23:59 Shaohua Li
2015-10-13 20:50 ` Neil Brown
0 siblings, 1 reply; 2+ messages in thread
From: Shaohua Li @ 2015-10-12 23:59 UTC (permalink / raw)
To: linux-raid; +Cc: Kernel-team, songliubraving, hch, dan.j.williams, neilb
journal disk can be faulty. The Journal and Faulty aren't exclusive with
each other.
Signed-off-by: Shaohua Li <shli@fb.com>
---
drivers/md/md.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0729cc7..f1114a6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5857,7 +5857,8 @@ static int get_disk_info(struct mddev *mddev, void __user * arg)
else if (test_bit(In_sync, &rdev->flags)) {
info.state |= (1<<MD_DISK_ACTIVE);
info.state |= (1<<MD_DISK_SYNC);
- } else if (test_bit(Journal, &rdev->flags))
+ }
+ if (test_bit(Journal, &rdev->flags))
info.state |= (1<<MD_DISK_JOURNAL);
if (test_bit(WriteMostly, &rdev->flags))
info.state |= (1<<MD_DISK_WRITEMOSTLY);
@@ -7339,14 +7340,12 @@ static int md_seq_show(struct seq_file *seq, void *v)
bdevname(rdev->bdev,b), rdev->desc_nr);
if (test_bit(WriteMostly, &rdev->flags))
seq_printf(seq, "(W)");
+ if (test_bit(Journal, &rdev->flags))
+ seq_printf(seq, "(J)");
if (test_bit(Faulty, &rdev->flags)) {
seq_printf(seq, "(F)");
continue;
}
- if (test_bit(Journal, &rdev->flags)) {
- seq_printf(seq, "(J)");
- continue;
- }
if (rdev->raid_disk < 0)
seq_printf(seq, "(S)"); /* spare */
if (test_bit(Replacement, &rdev->flags))
--
2.4.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V2] MD: fix info output for journal disk
2015-10-12 23:59 [PATCH V2] MD: fix info output for journal disk Shaohua Li
@ 2015-10-13 20:50 ` Neil Brown
0 siblings, 0 replies; 2+ messages in thread
From: Neil Brown @ 2015-10-13 20:50 UTC (permalink / raw)
To: Shaohua Li, linux-raid; +Cc: Kernel-team, songliubraving, hch, dan.j.williams
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
Shaohua Li <shli@fb.com> writes:
> journal disk can be faulty. The Journal and Faulty aren't exclusive with
> each other.
>
> Signed-off-by: Shaohua Li <shli@fb.com>
> ---
> drivers/md/md.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 0729cc7..f1114a6 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -5857,7 +5857,8 @@ static int get_disk_info(struct mddev *mddev, void __user * arg)
> else if (test_bit(In_sync, &rdev->flags)) {
> info.state |= (1<<MD_DISK_ACTIVE);
> info.state |= (1<<MD_DISK_SYNC);
> - } else if (test_bit(Journal, &rdev->flags))
> + }
> + if (test_bit(Journal, &rdev->flags))
> info.state |= (1<<MD_DISK_JOURNAL);
> if (test_bit(WriteMostly, &rdev->flags))
> info.state |= (1<<MD_DISK_WRITEMOSTLY);
> @@ -7339,14 +7340,12 @@ static int md_seq_show(struct seq_file *seq, void *v)
> bdevname(rdev->bdev,b), rdev->desc_nr);
> if (test_bit(WriteMostly, &rdev->flags))
> seq_printf(seq, "(W)");
> + if (test_bit(Journal, &rdev->flags))
> + seq_printf(seq, "(J)");
> if (test_bit(Faulty, &rdev->flags)) {
> seq_printf(seq, "(F)");
> continue;
> }
> - if (test_bit(Journal, &rdev->flags)) {
> - seq_printf(seq, "(J)");
> - continue;
> - }
> if (rdev->raid_disk < 0)
> seq_printf(seq, "(S)"); /* spare */
> if (test_bit(Replacement, &rdev->flags))
> --
> 2.4.6
Applied, thanks.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-13 20:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 23:59 [PATCH V2] MD: fix info output for journal disk Shaohua Li
2015-10-13 20:50 ` Neil Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.