Remove getinfo_super_n and do some other cleaning up.

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 97569fad0711dd5d5fddbf1fb3ccd5b7c841f072..e23a7033de0356f803d156c7af835ea11c54a37a 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -429,10 +429,12 @@ extern struct superswitch {
         * The determination is made either by:
         *   load_super being given a 'component' string.
         *   validate_geometry determining what to create.
-        * getinfo_super_n really needs to be removed..
+        * The info includes both array information and device information.
+        * The particular device should be:
+        *   The last device added by add_to_super
+        *   The device the metadata was loaded from by load_super
         */
        void (*getinfo_super)(struct supertype *st, struct mdinfo *info);
-       void (*getinfo_super_n)(struct supertype *st, struct mdinfo *info);
 
        /* Check if the given metadata is flagged as belonging to "this"
         * host.  For arrays that don't determine a minor-number, this
@@ -563,6 +565,7 @@ 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;
 
@@ -582,7 +585,6 @@ struct supertype {
 
 };
 
-extern struct supertype supertype_container_member;
 extern struct supertype *super_by_fd(int fd);
 extern struct supertype *guess_super(int fd);
 extern struct supertype *dup_super(struct supertype *st);