Assemble: fix --force assembly of v1.x arrays which are recovering.

[thirdparty/mdadm.git] / Incremental.c

diff --git a/Incremental.c b/Incremental.c
index ec94be4b4b18399dfcb37bf13537bb181bda45a7..8c686f7e8e6bde1d426d8731f3bdeca8a9d5c1d3 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -2,7 +2,7 @@
  * Incremental.c - support --incremental.  Part of:
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2006-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -391,14 +391,14 @@ int Incremental(char *devname, int verbose, int runstop,
                /* add disk needs to know about containers */
                if (st->ss->external)
                        sra->array.level = LEVEL_CONTAINER;
-               err = add_disk(mdfd, st2, sra, &info2);
+               err = add_disk(mdfd, st, sra, &info2);
                if (err < 0 && errno == EBUSY) {
                        /* could be another device present with the same
                         * disk.number. Find and reject any such
                         */
                        find_reject(mdfd, st, sra, info.disk.number,
                                    info.events, verbose, chosen_name);
-                       err = add_disk(mdfd, st2, sra, &info2);
+                       err = add_disk(mdfd, st, sra, &info2);
                }
                if (err < 0) {
                        fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
@@ -670,7 +670,7 @@ int IncrementalScan(int verbose)
                /* Ok, we can try this one.   Maybe it needs a bitmap */
                for (mddev = devs ; mddev ; mddev = mddev->next)
                        if (mddev->devname && me->path
-                           && strcmp(mddev->devname, me->path))
+                           && devname_matches(mddev->devname, me->path))
                                break;
                if (mddev && mddev->bitmap_file) {
                        /*