Manage_ro(): Check pointer rather than dereferencing it

[thirdparty/mdadm.git] / mdmon.h

diff --git a/mdmon.h b/mdmon.h
index 4494085326bc4b64dea735f3717cb46759cd54ca..59e1b537f620cf4cd4a64fa5b30f179d0e5c2cc9 100644 (file)
--- a/mdmon.h
+++ b/mdmon.h
@@ -28,15 +28,26 @@ struct active_array {
        struct mdinfo info;
        struct supertype *container;
        struct active_array *next, *replaces;
+       int to_remove;
 
        int action_fd;
        int resync_start_fd;
        int metadata_fd; /* for monitoring rw/ro status */
+       int sync_completed_fd; /* for checkpoint notification events */
+       unsigned long long last_checkpoint; /* sync_completed fires for many
+                                            * reasons this field makes sure the
+                                            * kernel has made progress before
+                                            * moving the checkpoint.  It is
+                                            * cleared by the metadata handler
+                                            * when it determines recovery is
+                                            * terminated.
+                                            */
 
        enum array_state prev_state, curr_state, next_state;
        enum sync_action prev_action, curr_action, next_action;
 
        int check_degraded; /* flag set by mon, read by manage */
+       int check_reshape; /* flag set by mon, read by manage */
 
        int devnum;
 };
@@ -65,9 +76,6 @@ extern struct md_generic_cmd *active_cmd;
 void remove_pidfile(char *devname);
 void do_monitor(struct supertype *container);
 void do_manager(struct supertype *container);
-int make_control_sock(char *devname);
-int make_pidfile(char *devname, int o_excl);
-extern int socket_hup_requested;
 extern int sigterm;
 
 int read_dev_state(int fd);