Factor out test for subarray version string.

[thirdparty/mdadm.git] / managemon.c

diff --git a/managemon.c b/managemon.c
index 9612007752e1cd6f1771b45629fea2313e6b4780..1c329c583a2a8d58ce7d42bb311e21e7bcd28b8e 100644 (file)
--- a/managemon.c
+++ b/managemon.c
@@ -492,7 +492,8 @@ void manage(struct mdstat_ent *mdstat, struct supertype *container)
                        continue;
                }
                if (mdstat->metadata_version == NULL ||
                        continue;
                }
                if (mdstat->metadata_version == NULL ||

-                   strncmp(mdstat->metadata_version, "external:/", 10) != 0 ||
+                   strncmp(mdstat->metadata_version, "external:", 9) != 0 ||
+                   !is_subarray(mdstat->metadata_version+9) ||

                    strncmp(mdstat->metadata_version+10, container->devname,
                            strlen(container->devname)) != 0 ||
                    mdstat->metadata_version[10+strlen(container->devname)]
                    strncmp(mdstat->metadata_version+10, container->devname,
                            strlen(container->devname)) != 0 ||
                    mdstat->metadata_version[10+strlen(container->devname)]