Replace all relevant occurrences of -4 with LEVEL_MULTIPATH

[thirdparty/mdadm.git] / mdassemble.c

diff --git a/mdassemble.c b/mdassemble.c
index a680378a113c04778b54b93c73ba1cfc9be62dd9..d0d0707e123412b6233fad96285ad6eb8114c137 100644 (file)
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -1,7 +1,7 @@
 /*
  * mdassemble - assemble Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
  * Copyright (C) 2003 Luca Berra <bluca@vodka.it>
  *
  *
@@ -20,12 +20,7 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *    Author: Neil Brown
- *    Email: <neilb@cse.unsw.edu.au>
- *    Paper: Neil Brown
- *           School of Computer Science and Engineering
- *           The University of New South Wales
- *           Sydney, 2052
- *           Australia
+ *    Email: <neilb@suse.de>
  */
 
 #include "mdadm.h"
@@ -33,7 +28,7 @@
 
 /* from readme.c */
 mapping_t pers[] = {
-       { "linear", -1},
+       { "linear", LEVEL_LINEAR},
        { "raid0", 0},
        { "0", 0},
        { "stripe", 0},
@@ -44,8 +39,8 @@ mapping_t pers[] = {
        { "4", 4},
        { "raid5", 5},
        { "5", 5},
-       { "multipath", -4},
-       { "mp", -4},
+       { "multipath", LEVEL_MULTIPATH},
+       { "mp", LEVEL_MULTIPATH},
        { "raid6", 6},
        { "6", 6},
        { "raid10", 10},
@@ -74,10 +69,6 @@ int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,
 {
        return open_mddev(dev, 0);
 }
-int sysfs_uevent(struct mdinfo *info, char *event)
-{
-       return 0;
-}
 #endif
 int map_update(struct map_ent **mpp, int devnum, char *metadata,
               int *uuid, char *path)
@@ -104,6 +95,8 @@ int main(int argc, char *argv[]) {
        } else
                for (; array_list; array_list = array_list->next) {
                        mdu_array_info_t array;
+                       if (strcasecmp(array_list->devname, "<ignore>") == 0)
+                               continue;
                        mdfd = open_mddev(array_list->devname, 0);
                        if (mdfd >= 0 && ioctl(mdfd, GET_ARRAY_INFO, &array) == 0) {
                                rv |= Manage_ro(array_list->devname, mdfd, -1); /* make it readwrite */
@@ -113,7 +106,8 @@ int main(int argc, char *argv[]) {
                                close(mdfd);
                        rv |= Assemble(array_list->st, array_list->devname,
                                       array_list, NULL, NULL,
-                                      readonly, runstop, NULL, NULL, verbose, force);
+                                      readonly, runstop, NULL, NULL, 0,
+                                      verbose, force);
                }
        return rv;
 }