diff options
| author | Shaohua Li <shli@fb.com> | 2015-10-12 16:59:50 -0700 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-11-01 13:48:29 +1100 |
| commit | 9efdca16e0182eca489a519f576019fd9c0c1b25 (patch) | |
| tree | a71dede6a1223fefbb946a837e808bd1bbe6bc67 /drivers/md | |
| parent | 6143e2cecb9ef9c7d3392c9c2583f231705413a5 (diff) | |
| download | op-kernel-dev-9efdca16e0182eca489a519f576019fd9c0c1b25.zip op-kernel-dev-9efdca16e0182eca489a519f576019fd9c0c1b25.tar.gz | |
MD: fix info output for journal disk
journal disk can be faulty. The Journal and Faulty aren't exclusive with
each other.
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 5744829..e4e2731 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5874,7 +5874,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); @@ -7363,14 +7364,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)) |
