Handle device removal from container

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 97569fad0711dd5d5fddbf1fb3ccd5b7c841f072..ba9174ea8da6e673db277cf3cad4fe072bdfb090 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -348,6 +348,7 @@ extern int sysfs_set_array(struct mdinfo *sra,
 extern int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd);
 extern int sysfs_disk_to_sg(int fd);
 extern int sysfs_disk_to_scsi_id(int fd, __u32 *id);
+extern int sysfs_unique_holder(int devnum, long rdev);
 
 
 extern int save_stripes(int *source, unsigned long long *offsets,
@@ -429,10 +430,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
@@ -499,6 +502,15 @@ extern struct superswitch {
        void (*locate_bitmap)(struct supertype *st, int fd);
        int (*write_bitmap)(struct supertype *st, int fd);
        void (*free_super)(struct supertype *st);
+
+       /* validate_geometry is called with an st returned by
+        * match_metadata_desc.
+        * It should check that the geometry described in compatible with
+        * the metadata type.  It will be called repeatedly as devices
+        * added to validate changing size and new devices.  If there are
+        * inter-device dependencies, it should record sufficient details
+        * so these can be validated.
+        */
        int (*validate_geometry)(struct supertype *st, int level, int layout,
                                 int raiddisks,
                                 int chunk, unsigned long long size,
@@ -563,6 +575,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 +595,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);