Assemble: turn next_member goto loop into a for loop.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index f49281e036572d4bf167cfd27aad23e5267d0e25..f744cdbe1ac9ba5aa33cda6c3bd998b7856599cb 100644 (file)
--- 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);