Examine: fix --examine --brief --verbose on containers.

With --verbose, --examine --brief prints dev= information after
the personality has done its bit.
But with containers, the member array are printed in between.
So in super-ddf and super-intel, move printing of the member
arrays to before printing of the container.  This avoids
confusion.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/super-ddf.c b/super-ddf.c
index bcd44d1ea4b5ab074fe3f7320808800e688fb2b2..5ad89c25a84c427a6da3899f73832afe6a90c029 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1172,7 +1172,6 @@ static void brief_examine_super_ddf(struct supertype *st, int verbose)
        char nbuf[64];
        getinfo_super_ddf(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');
        char nbuf[64];
        getinfo_super_ddf(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');

-       printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5);

 
        for (i=0; i<__be16_to_cpu(ddf->virt->max_vdes); i++) {
                struct virtual_entry *ve = &ddf->virt->entries[i];
 
        for (i=0; i<__be16_to_cpu(ddf->virt->max_vdes); i++) {
                struct virtual_entry *ve = &ddf->virt->entries[i];


@@ -1187,6 +1186,7 @@ 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 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)
 }
 
 static void export_examine_super_ddf(struct supertype *st)

diff --git a/super-intel.c b/super-intel.c
index 7e2a086db9afa8093b44351e8482d60f5fa109c7..3abaca5adecc6249b791a7e297a7da468837c83d 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -768,7 +768,6 @@ static void brief_examine_super_imsm(struct supertype *st, int verbose)
 
        getinfo_super_imsm(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');
 
        getinfo_super_imsm(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');

-       printf("ARRAY metadata=imsm UUID=%s\n", nbuf + 5);

        for (i = 0; i < super->anchor->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
 
        for (i = 0; i < super->anchor->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
 


@@ -778,6 +777,7 @@ static void brief_examine_super_imsm(struct supertype *st, int verbose)
                printf("ARRAY /dev/md/%.16s container=%s member=%d UUID=%s\n",
                       dev->volume, nbuf + 5, i, nbuf1 + 5);
        }
                printf("ARRAY /dev/md/%.16s container=%s member=%d UUID=%s\n",
                       dev->volume, nbuf + 5, i, nbuf1 + 5);
        }

+       printf("ARRAY metadata=imsm UUID=%s\n", nbuf + 5);

 }
 
 static void export_examine_super_imsm(struct supertype *st)
 }
 
 static void export_examine_super_imsm(struct supertype *st)