]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Incremental: don't try to load_container() for a subarray
authorArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Tue, 9 Aug 2016 08:05:51 +0000 (10:05 +0200)
committerJes Sorensen <Jes.Sorensen@redhat.com>
Tue, 9 Aug 2016 14:57:15 +0000 (10:57 -0400)
mdadm -IRs would exit with a non-zero status because of this.

Reported-by: Xiao Ni <xni@redhat.com>
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Incremental.c

index ba97b008187975681fb2dd65b4378878f2a735ea..cc01d41e641af8c46fc151594cd6628daafad206 100644 (file)
@@ -1347,8 +1347,12 @@ restart:
 
                if (devnm && strcmp(devnm, me->devnm) != 0)
                        continue;
-               if (devnm && me->metadata[0] == '/') {
+               if (me->metadata[0] == '/') {
                        char *sl;
+
+                       if (!devnm)
+                               continue;
+
                        /* member array, need to work on container */
                        strncpy(container, me->metadata+1, 32);
                        container[31] = 0;