ddf: set vcnum correctly when creating a new virtual device in conflist

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 54df02a1115c56fc79c212ab79cbb9398fb85826..fcb0e3b32970634ffa80979abdb74290165f1994 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -195,7 +195,7 @@ struct mdinfo {
        unsigned long           safe_mode_delay; /* ms delay to mark clean */
        int                     new_level, delta_disks, new_layout, new_chunk;
        int                     errors;
-       int                     cache_size; /* size of raid456 stripe cache*/
+       unsigned long           cache_size; /* size of raid456 stripe cache*/
        int                     mismatch_cnt;
        char                    text_version[50];
        void                    *update_private; /* for passing metadata-format
@@ -300,14 +300,14 @@ typedef struct mddev_ident_s {
        int     uuid[4];
        char    name[33];
 
-       unsigned int super_minor;
+       int super_minor;
 
        char    *devices;       /* comma separated list of device
                                 * names with wild cards
                                 */
        int     level;
-       unsigned int raid_disks;
-       unsigned int spare_disks;
+       int raid_disks;
+       int spare_disks;
        struct supertype *st;
        int     autof;          /* 1 for normal, 2 for partitioned */
        char    *spare_group;
@@ -358,7 +358,6 @@ struct mdstat_ent {
        int             resync; /* 1 if resync, 0 if recovery */
        int             devcnt;
        int             raid_disks;
-       int             chunk_size;
        char *          metadata_version;
        struct dev_member {
                char                    *name;
@@ -892,6 +891,7 @@ extern char *fname_from_uuid(struct supertype *st,
 extern unsigned long calc_csum(void *super, int bytes);
 extern int enough(int level, int raid_disks, int layout, int clean,
                   char *avail, int avail_disks);
+extern int enough_fd(int fd);
 extern int ask(char *mesg);
 extern unsigned long long get_component_size(int fd);
 extern void remove_partitions(int fd);