Provide a mdstat_ent to subarray helper

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 1ecce3b8fd73d598051955bd8c6343b65bf29a9b..ad2ec923bf8559d476573e404f0c807b64793e5b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1449,14 +1449,11 @@ int is_subarray_active(char *subarray, char *container)
        struct mdstat_ent *mdstat = mdstat_read(0, 0);
        struct mdstat_ent *ent;
 
-       for (ent = mdstat; ent; ent = ent->next) {
-               if (is_container_member(ent, container)) {
-                       char *inst = &ent->metadata_version[10+strlen(container)+1];
-
-                       if (!subarray || strcmp(inst, subarray) == 0)
+       for (ent = mdstat; ent; ent = ent->next)
+               if (is_container_member(ent, container))
+                       if (!subarray ||
+                           strcmp(to_subarray(ent, container), subarray) == 0)
                                break;
-               }
-       }
 
        free_mdstat(mdstat);