From db20d4135e0db3830f0bbf99b81922b902628214 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 22 Nov 2010 20:24:50 +1100 Subject: [PATCH] Switch open_subarray to use the new load_container This removes another user of loaded_container Signed-off-by: NeilBrown --- util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util.c b/util.c index f49281e0..f744cdbe 100644 --- a/util.c +++ b/util.c @@ -1498,17 +1498,17 @@ int open_subarray(char *dev, char *subarray, struct supertype *st, int quiet) goto free_sysfs; } - if (st->ss->load_super(st, fd, NULL)) { + if (!st->ss->load_container) { if (!quiet) - fprintf(stderr, Name ": Failed to load metadata for %s\n", - dev); + fprintf(stderr, Name ": %s is not a container\n", dev); goto free_name; } - if (!st->loaded_container) { + if (st->ss->load_container(st, fd, NULL)) { if (!quiet) - fprintf(stderr, Name ": %s is not a container\n", dev); - goto free_super; + fprintf(stderr, Name ": Failed to load metadata for %s\n", + dev); + goto free_name; } info = st->ss->container_content(st, subarray); -- 2.39.2