summaryrefslogtreecommitdiffstats
path: root/Examine.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-07-10 02:44:32 +0200
committerNeilBrown <neilb@suse.de>2009-07-10 02:44:32 +0200
commit0ea2b5ef1be03802f34537330884cdaf72494b01 (patch)
tree283ab61c5e605f48bb6bcca99a7549aa9d51c9fd /Examine.c
parentExamine: fix --examine --brief --verbose on containers. (diff)
downloadmdadm-0ea2b5ef1be03802f34537330884cdaf72494b01.tar.xz
mdadm-0ea2b5ef1be03802f34537330884cdaf72494b01.zip
Examine: make --metadata= work with --brief
They had different assumptions about the lifetime of 'st'. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Examine.c')
-rw-r--r--Examine.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Examine.c b/Examine.c
index f0e98f97..46fee950 100644
--- a/Examine.c
+++ b/Examine.c
@@ -63,7 +63,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
} *arrays = NULL;
for (; devlist ; devlist=devlist->next) {
- struct supertype *st = forcest;
+ struct supertype *st;
fd = dev_open(devlist->devname, O_RDONLY);
if (fd < 0) {
@@ -75,7 +75,9 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
err = 1;
}
else {
- if (!st)
+ if (forcest)
+ st = dup_super(forcest);
+ else
st = guess_super(fd);
if (st)
err = st->ss->load_super(st, fd,