fix: adjust parse_size() to the unsigned size variable

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 74dc0fb8b37d035bd1b240e4612e1f38cf1e5d80..f202ffa67c145bbf4e9e147ed9f4a755526b7893 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -396,6 +396,20 @@ struct context {
        int     invalid_backup;
 };
 
+struct shape {
+       int     raiddisks;
+       int     sparedisks;
+       int     level;
+       int     layout;
+       char    *layout_str;
+       int     chunk;
+       int     bitmap_chunk;
+       char    *bitmap_file;
+       int     assume_clean;
+       int     write_behind;
+       unsigned long long size;
+};
+
 /* List of device names - wildcards expanded */
 struct mddev_dev {
        char *devname;
@@ -776,7 +790,8 @@ extern struct superswitch {
 #define APPLY_METADATA_CHANGES         1
 #define ROLLBACK_METADATA_CHANGES      0
 
-       int (*reshape_super)(struct supertype *st, long long size, int level,
+       int (*reshape_super)(struct supertype *st,
+                            unsigned long long size, int level,
                             int layout, int chunksize, int raid_disks,
                             int delta_disks, char *backup, char *dev,
                             int direction,
@@ -1066,18 +1081,16 @@ extern int add_dev(const char *name, const struct stat *stb, int flag, struct FT
 extern int Manage_ro(char *devname, int fd, int readonly);
 extern int Manage_runstop(char *devname, int fd, int runstop, int quiet,
                          int will_retry);
-extern int Manage_resize(char *devname, int fd, long long size, int raid_disks);
 extern int Manage_subdevs(char *devname, int fd,
                          struct mddev_dev *devlist, int verbose, int test,
                          char *update, int force);
 extern int autodetect(void);
 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, int force);
-extern int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
-                       long long size,
-                       int level, char *layout_str, int chunksize, int raid_disks,
+extern int Grow_addbitmap(char *devname, int fd,
+                         struct context *c, struct shape *s);
+extern int Grow_reshape(char *devname, int fd,
                        struct mddev_dev *devlist,
-                       int assume_clean, int force);
+                       struct context *c, struct shape *s);
 extern int Grow_restart(struct supertype *st, struct mdinfo *info,
                        int *fdlist, int cnt, char *backup_file, int verbose);
 extern int Grow_continue(int mdfd, struct supertype *st,
@@ -1098,31 +1111,26 @@ extern int Assemble(struct supertype *st, char *mddev,
                    struct mddev_dev *devlist,
                    struct context *c);
 
-extern int Build(char *mddev, int chunk, int level, int layout,
-                int raiddisks, struct mddev_dev *devlist, int assume_clean,
-                char *bitmap_file, int bitmap_chunk, int write_behind,
-                int delay, int verbose, int autof, unsigned long long size);
-
+extern int Build(char *mddev, struct mddev_dev *devlist,
+                struct shape *s, struct context *c);
 
 extern int Create(struct supertype *st, char *mddev,
-                 int chunk, int level, int layout, unsigned long long size,
-                 int raiddisks, int sparedisks,
-                 char *name, char *homehost, int *uuid,
+                 char *name, int *uuid,
                  int subdevs, struct mddev_dev *devlist,
-                 int runstop, int readonly, int verbose,
-                 int force, int assume_clean,
-                 char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof);
+                 struct shape *s,
+                 struct context *c);
 
-extern int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer);
+extern int Detail(char *dev, struct context *c);
 extern int Detail_Platform(struct superswitch *ss, int scan, int verbose);
 extern int Query(char *dev);
-extern int Examine(struct mddev_dev *devlist, int brief, int export, int scan,
-                  int SparcAdjust, struct supertype *forcest, char *homehost);
+extern int Examine(struct mddev_dev *devlist, struct context *c,
+                  struct supertype *forcest);
 extern int Monitor(struct mddev_dev *devlist,
                   char *mailaddr, char *alert_cmd,
-                  int period, int daemonise, int scan, int oneshot,
-                  int dosyslog, int test, char *pidfile, int increments,
-                  int share, char *prefer);
+                  struct context *c,
+                  int daemonise, int oneshot,
+                  int dosyslog, char *pidfile, int increments,
+                  int share);
 
 extern int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl);
 extern int Kill_subarray(char *dev, char *subarray, int verbose);
@@ -1130,9 +1138,8 @@ extern int Update_subarray(char *dev, char *subarray, char *update, struct mddev
 extern int Wait(char *dev);
 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, int freeze_reshape);
+extern int Incremental(char *devname, struct context *c,
+                      struct supertype *st);
 extern void RebuildMap(void);
 extern int IncrementalScan(int verbose);
 extern int IncrementalRemove(char *devname, char *path, int verbose);
@@ -1149,7 +1156,7 @@ extern unsigned long bitmap_sectors(struct bitmap_super_s *bsb);
 extern int md_get_version(int fd);
 extern int get_linux_version(void);
 extern int mdadm_version(char *version);
-extern long long parse_size(char *size);
+extern unsigned long long parse_size(char *size);
 extern int parse_uuid(char *str, int uuid[4]);
 extern int parse_layout_10(char *layout);
 extern int parse_layout_faulty(char *layout);
@@ -1215,10 +1222,9 @@ extern unsigned long long calc_array_size(int level, int raid_disks, int layout,
 extern int flush_metadata_updates(struct supertype *st);
 extern void append_metadata_update(struct supertype *st, void *buf, int len);
 extern int assemble_container_content(struct supertype *st, int mdfd,
-                                     struct mdinfo *content, int runstop,
-                                     int readonly,
-                                     char *chosen_name, int verbose,
-                                     char *backup_file, int freeze_reshape);
+                                     struct mdinfo *content,
+                                     struct context *c,
+                                     char *chosen_name);
 extern struct mdinfo *container_choose_spares(struct supertype *st,
                                              unsigned long long min_size,
                                              struct domainlist *domlist,
@@ -1441,4 +1447,8 @@ char *xstrdup(const char *str);
  */
 #define MAX_DISKS      4096
 
+/* Sometimes the 'size' value passed needs to mean "Maximum".
+ * In those cases with use MAX_SIZE
+ */
+#define MAX_SIZE       1
 extern int __offroot;