]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Assemble: skip devices that don't match uuid instead of aborting the assembly.
authorSudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
Thu, 22 Jul 2021 18:28:34 +0000 (18:28 +0000)
committerJes Sorensen <jsorensen@fb.com>
Mon, 2 Aug 2021 14:53:33 +0000 (10:53 -0400)
This fixes '03r0assem' test as assembly fails when looking for specific
uuid among the device list.

Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Assemble.c

index f954b4db20419fd3b86d3c6f01f24ed711308d0d..0df46244d7fb6dfcc929b1f8259fe1661c44c071 100644 (file)
@@ -331,6 +331,11 @@ static int select_devices(struct mddev_dev *devlist,
                                /* Ignore unrecognised device if looking for
                                 * specific array */
                                goto loop;
+                       if (ident->uuid_set)
+                               /* ignore unrecognized device if looking for
+                                * specific uuid
+                                */
+                               goto loop;
 
                        pr_err("%s has no superblock - assembly aborted\n",
                               devname);