diff options
| author | NeilBrown <neilb@suse.de> | 2009-08-07 06:17:40 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-08-07 06:17:40 +0200 |
| commit | 4737ae25dec3b6b703f8f60f351e2d6d7b527ac1 (patch) | |
| tree | 4b39ef9ba51528891e1713f434b9b530628423ca /super-ddf.c | |
| parent | Merge branch 'master' of git://github.com/djbw/mdadm (diff) | |
| download | mdadm-4737ae25dec3b6b703f8f60f351e2d6d7b527ac1.tar.xz mdadm-4737ae25dec3b6b703f8f60f351e2d6d7b527ac1.zip | |
Exmaine/brief: put member arrays after container arrays.
A previous patch moved move the '--examine --brief' reporting of
member arrays to before their containers. This breaks "mdadm -As"
assembly. So put them back, but still fix the problem addressed by
previous patch.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'super-ddf.c')
| -rw-r--r-- | super-ddf.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/super-ddf.c b/super-ddf.c index c28d8040..9bf08c2c 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -1183,6 +1183,18 @@ static void brief_examine_super_ddf(struct supertype *st, int verbose) { /* We just write a generic DDF ARRAY entry */ + struct mdinfo info; + char nbuf[64]; + getinfo_super_ddf(st, &info); + fname_from_uuid(st, &info, nbuf, ':'); + + printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5); +} + +static void brief_examine_subarrays_ddf(struct supertype *st, int verbose) +{ + /* We just write a generic DDF ARRAY entry + */ struct ddf_super *ddf = st->sb; struct mdinfo info; int i; @@ -1203,7 +1215,6 @@ static void brief_examine_super_ddf(struct supertype *st, int verbose) printf("ARRAY container=%s member=%d UUID=%s\n", nbuf+5, i, nbuf1+5); } - printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5); } static void export_examine_super_ddf(struct supertype *st) @@ -3597,6 +3608,7 @@ struct superswitch super_ddf = { #ifndef MDASSEMBLE .examine_super = examine_super_ddf, .brief_examine_super = brief_examine_super_ddf, + .brief_examine_subarrays = brief_examine_subarrays_ddf, .export_examine_super = export_examine_super_ddf, .detail_super = detail_super_ddf, .brief_detail_super = brief_detail_super_ddf, |