Use load_container in Incremental assembly.

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 25bc6230eadf8273af0da36bc69bc5ab7e30eae8..7b651e27c535c4bb47951f5165e0bd14f4ff0a5c 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -597,6 +597,7 @@ extern struct superswitch {
        int (*write_init_super)(struct supertype *st);
        int (*compare_super)(struct supertype *st, struct supertype *tst);
        int (*load_super)(struct supertype *st, int fd, char *devname);
+       int (*load_container)(struct supertype *st, int fd, char *devname);
        struct supertype * (*match_metadata_desc)(char *arg);
        __u64 (*avail_size)(struct supertype *st, __u64 size);
        int (*add_internal_bitmap)(struct supertype *st, int *chunkp,
@@ -711,7 +712,6 @@ struct supertype {
        int minor_version;
        int max_devs;
        int container_dev;    /* devnum of container */
-       char subarray[32];      /* name of array inside container */
        void *sb;
        void *info;
        int loaded_container;   /* Set if load_super found a container,
@@ -929,9 +929,6 @@ extern int WaitClean(char *dev, int sock, int verbose);
 extern int Incremental(char *devname, int verbose, int runstop,
                       struct supertype *st, char *homehost, int require_homehost,
                       int autof);
-extern int Incremental_container(struct supertype *st, char *devname,
-                                int verbose, int runstop, int autof,
-                                int trustworthy);
 extern void RebuildMap(void);
 extern int IncrementalScan(int verbose);
 extern int IncrementalRemove(char *devname, int verbose);