remove ANNOUNCE-2.0-devel-?

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 8b58afc067dfc4ee30541582edef224ac3e0301f..06dd1141b3669568f818223c1eedc1196836891d 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -112,6 +112,7 @@ typedef struct mddev_ident_s {
        
        int     uuid_set;
        int     uuid[4];
+       char    name[33];
 
        unsigned int super_minor;
 
@@ -136,6 +137,7 @@ typedef struct mddev_dev_s {
                                 * Not set for names read from .config
                                 */
        char writemostly;
+       char re_add;
        struct mddev_dev_s *next;
 } *mddev_dev_t;
 
@@ -177,18 +179,18 @@ extern struct superswitch {
        void (*detail_super)(void *sbv);
        void (*brief_detail_super)(void *sbv);
        void (*uuid_from_super)(int uuid[4], void *sbv);
-       void (*getinfo_super)(struct mdinfo *info, void *sbv);
+       void (*getinfo_super)(struct mdinfo *info, mddev_ident_t ident, void *sbv);
        int (*update_super)(struct mdinfo *info, void *sbv, char *update, char *devname, int verbose);
        __u64 (*event_super)(void *sbv);
-       int (*init_super)(struct supertype *st, void **sbp, mdu_array_info_t *info);
+       int (*init_super)(struct supertype *st, void **sbp, mdu_array_info_t *info, char *name);
        void (*add_to_super)(void *sbv, mdu_disk_info_t *dinfo);
        int (*store_super)(struct supertype *st, int fd, void *sbv);
-       int (*write_init_super)(struct supertype *st, void *sbv, mdu_disk_info_t *dinfo, char *devname);
+       int (*write_init_super)(struct supertype *st, void *sbv, mdu_disk_info_t *dinfo, char *devname, int reserve);
        int (*compare_super)(void **firstp, void *secondv);
        int (*load_super)(struct supertype *st, int fd, void **sbp, char *devname);
        struct supertype * (*match_metadata_desc)(char *arg);
-       __u64 (*avail_size)(__u64 size);
-       int (*add_internal_bitmap)(void *sbv, int chunk, int delay, int write_behind, unsigned long long size);
+       __u64 (*avail_size)(struct supertype *st, __u64 size, int reserve);
+       int (*add_internal_bitmap)(struct supertype *st, void *sbv, int chunk, int delay, int write_behind, unsigned long long size);
        void (*locate_bitmap)(struct supertype *st, int fd);
        int (*write_bitmap)(struct supertype *st, int fd, void *sbv);
        int major;
@@ -223,7 +225,7 @@ extern int Manage_runstop(char *devname, int fd, int runstop, int quiet);
 extern int Manage_resize(char *devname, int fd, long long size, int raid_disks);
 extern int Manage_reconfig(char *devname, int fd, int layout);
 extern int Manage_subdevs(char *devname, int fd,
-                         mddev_dev_t devlist);
+                         mddev_dev_t devlist, int verbose);
 extern int Grow_Add_device(char *devname, int fd, char *newdev);
 extern int Grow_addbitmap(char *devname, int fd, char *file, int chunk, int delay, int write_behind);
 
@@ -239,11 +241,12 @@ extern int Assemble(struct supertype *st, char *mddev, int mdfd,
 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);
+                char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose);
 
 
 extern int Create(struct supertype *st, char *mddev, int mdfd,
                  int chunk, int level, int layout, unsigned long size, int raiddisks, int sparedisks,
+                 char *name,
                  int subdevs, mddev_dev_t devlist,
                  int runstop, int verbose, int force,
                  char *bitmap_file, int bitmap_chunk, int write_behind, int delay);