Discard 'quiet' context variable.

[thirdparty/mdadm.git] / mdadm.h

diff --git a/mdadm.h b/mdadm.h
index 4946d4eac3d74233bfa479b2542fee0bb56bd5aa..6957c5b2f7e5148763a483fe3a897cd994ae1708 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -264,6 +264,7 @@ enum mode {
        GROW,
        INCREMENTAL,
        AUTODETECT,
+       mode_count
 };
 
 extern char short_options[];
@@ -271,6 +272,7 @@ extern char short_bitmap_options[];
 extern char short_bitmap_auto_options[];
 extern struct option long_options[];
 extern char Version[], Usage[], Help[], OptionHelp[],
+       *mode_help[],
        Help_create[], Help_build[], Help_assemble[], Help_grow[],
        Help_incr[],
        Help_manage[], Help_misc[], Help_monitor[], Help_config[];
@@ -323,6 +325,7 @@ enum special_options {
        Continue,
        OffRootOpt,
        Prefer,
+       KillOpt,
 };
 
 /* structures read from config file */
@@ -371,14 +374,36 @@ struct mddev_ident {
        };
 };
 
+struct context {
+       int     readonly;
+       int     runstop;
+       int     verbose;
+       int     brief;
+       int     force;
+       char    *homehost;
+       int     require_homehost;
+       char    *prefer;
+       int     export;
+       int     test;
+       char    *subarray;
+       char    *update;
+       int     scan;
+       int     SparcAdjust;
+       int     autof;
+       int     delay;
+       int     freeze_reshape;
+       char    *backup_file;
+       int     invalid_backup;
+};
+
 /* List of device names - wildcards expanded */
 struct mddev_dev {
        char *devname;
-       int disposition;        /* 'a' for add, 'r' for remove, 'f' for fail.
+       int disposition;        /* 'a' for add, 'r' for remove, 'f' for fail,
+                                * 'A' for re_add.
                                 * Not set for names read from .config
                                 */
        char writemostly;       /* 1 for 'set writemostly', 2 for 'clear writemostly' */
-       char re_add;
        char used;              /* set when used */
        struct mddev_dev *next;
 };
@@ -1039,7 +1064,8 @@ 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);
+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,
@@ -1082,10 +1108,12 @@ extern int Build(char *mddev, int chunk, int level, int layout,
 
 
 extern int Create(struct supertype *st, char *mddev,
-                 int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
+                 int chunk, int level, int layout, unsigned long long size,
+                 int raiddisks, int sparedisks,
                  char *name, char *homehost, int *uuid,
                  int subdevs, struct mddev_dev *devlist,
-                 int runstop, int verbose, int force, int assume_clean,
+                 int runstop, int readonly, int verbose,
+                 int force, int assume_clean,
                  char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof);
 
 extern int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer);
@@ -1099,8 +1127,8 @@ extern int Monitor(struct mddev_dev *devlist,
                   int dosyslog, int test, char *pidfile, int increments,
                   int share, char *prefer);
 
-extern int Kill(char *dev, struct supertype *st, int force, int quiet, int noexcl);
-extern int Kill_subarray(char *dev, char *subarray, int quiet);
+extern int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl);
+extern int Kill_subarray(char *dev, char *subarray, int verbose);
 extern int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident *ident, int quiet);
 extern int Wait(char *dev);
 extern int WaitClean(char *dev, int sock, int verbose);
@@ -1128,6 +1156,7 @@ extern 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);
+extern long parse_num(char *num);
 extern int check_ext2(int fd, char *name);
 extern int check_reiser(int fd, char *name);
 extern int check_raid(int fd, char *name);
@@ -1190,6 +1219,7 @@ 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);
 extern struct mdinfo *container_choose_spares(struct supertype *st,
@@ -1307,6 +1337,14 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
        return ret;
 }
 
+#define pr_err(fmt ...) fprintf(stderr, Name ": " fmt)
+#define cont_err(fmt ...) fprintf(stderr, "       " fmt)
+
+void *xmalloc(size_t len);
+void *xrealloc(void *ptr, size_t len);
+void *xcalloc(size_t num, size_t size);
+char *xstrdup(const char *str);
+
 #define        LEVEL_MULTIPATH         (-4)
 #define        LEVEL_LINEAR            (-1)
 #define        LEVEL_FAULTY            (-5)
@@ -1393,8 +1431,10 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
 #define PATH_MAX       4096
 #endif
 
-#define PROCESS_DELAYED -2
-#define PROCESS_PENDING -3
+#define RESYNC_NONE -1
+#define RESYNC_DELAYED -2
+#define RESYNC_PENDING -3
+#define RESYNC_UNKNOWN -4
 
 /* When using "GET_DISK_INFO" it isn't certain how high
  * we need to check.  So we impose an absolute limit of