mdopen: fix up name parsing.

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 4b006fb6884c108871d3539a25f81d0f168af6c6..c34efe9b8713bee2cd651bb5b7129e2749e5b420 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -259,8 +259,9 @@ typedef struct mddev_ident_s {
        char    *bitmap_file;
        int     bitmap_fd;
 
-       char    *container;     /* /dev/whatever name of container.  You
-                                * would expect this to be the 'devname'
+       char    *container;     /* /dev/whatever name of container, or
+                                * uuid of container.  You would expect
+                                * this to be the 'devname' or UUID
                                 * of some other entry.
                                 */
        char    *member;        /* subarray within a container */
@@ -355,6 +356,7 @@ extern int sysfs_set_str(struct mdinfo *sra, struct mdinfo *dev,
                         char *name, char *val);
 extern int sysfs_set_num(struct mdinfo *sra, struct mdinfo *dev,
                         char *name, unsigned long long val);
+extern int sysfs_uevent(struct mdinfo *sra, char *event);
 extern int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
                        char *name, unsigned long long *val);
 extern int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms);
@@ -692,25 +694,25 @@ extern int Grow_restart(struct supertype *st, struct mdinfo *info,
                        int *fdlist, int cnt, char *backup_file);
 
 
-extern int Assemble(struct supertype *st, char *mddev, int mdfd,
+extern int Assemble(struct supertype *st, char *mddev,
                    mddev_ident_t ident,
                    mddev_dev_t devlist, char *backup_file,
                    int readonly, int runstop,
                    char *update, char *homehost,
                    int verbose, int force);
 
-extern int Build(char *mddev, int mdfd, int chunk, int level, int layout,
-                int raiddisks,
-                mddev_dev_t devlist, int assume_clean,
-                char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose);
+extern int Build(char *mddev, int chunk, int level, int layout,
+                int raiddisks, mddev_dev_t devlist, int assume_clean,
+                char *bitmap_file, int bitmap_chunk, int write_behind,
+                int delay, int verbose, int autof);
 
 
-extern int Create(struct supertype *st, char *mddev, int mdfd,
+extern int Create(struct supertype *st, char *mddev,
                  int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
                  char *name, char *homehost, int *uuid,
                  int subdevs, mddev_dev_t devlist,
                  int runstop, int verbose, int force, int assume_clean,
-                 char *bitmap_file, int bitmap_chunk, int write_behind, int delay);
+                 char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof);
 
 extern int Detail(char *dev, int brief, int export, int test, char *homehost);
 extern int Query(char *dev);
@@ -728,7 +730,8 @@ extern int WaitClean(char *dev, int verbose);
 extern int Incremental(char *devname, int verbose, int runstop,
                       struct supertype *st, char *homehost, int autof);
 extern int Incremental_container(struct supertype *st, char *devname,
-                                int verbose, int runstop, int autof);
+                                int verbose, int runstop, int autof,
+                                int trustworthy);
 extern void RebuildMap(void);
 extern int IncrementalScan(int verbose);
 
@@ -801,14 +804,18 @@ extern char *get_md_name(int dev);
 
 extern char DefaultConfFile[];
 
-extern int open_mddev(char *dev, int autof);
-extern int open_mddev_devnum(char *devname, int devnum, char *name,
-                            char *chosen_name, int parts);
+extern int create_mddev(char *dev, char *name, int autof, int trustworthy,
+                       char *chosen);
+/* values for 'trustworthy' */
+#define        LOCAL   1
+#define        FOREIGN 2
+#define        METADATA 3
+extern int open_mddev(char *dev, int report_errors);
 extern int open_container(int fd);
 
 extern int mdmon_running(int devnum);
 extern int signal_mdmon(int devnum);
-extern int env_no_mdmon(void);
+extern int check_env(char *name);
 extern int start_mdmon(int devnum);
 
 extern char *devnum2devname(int num);