Provide a mdstat_ent to subarray helper

[thirdparty/mdadm.git] / mdmon.h

diff --git a/mdmon.h b/mdmon.h
index 8a5cd4a8af6c8948a2605f89d4d16e7b4e8d260e..5c515663f4a4225d1c23ec6c38c571537eca9cb2 100644 (file)
--- a/mdmon.h
+++ b/mdmon.h
@@ -1,3 +1,23 @@
+/*
+ * mdmon - monitor external metadata arrays
+ *
+ * Copyright (C) 2007-2009 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2007-2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 enum array_state { clear, inactive, suspended, readonly, read_auto,
                   clean, active, write_pending, active_idle, bad_word};
 
@@ -12,6 +32,15 @@ struct active_array {
        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;
@@ -19,8 +48,6 @@ struct active_array {
        int check_degraded; /* flag set by mon, read by manage */
 
        int devnum;
-
-       unsigned long long resync_start;
 };
 
 /*
@@ -47,13 +74,9 @@ 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);
-int get_resync_start(struct active_array *a);
 int is_container_member(struct mdstat_ent *mdstat, char *container);
 
 struct mdstat_ent *mdstat_read(int hold, int start);
@@ -65,9 +88,9 @@ extern int monitor_loop_cnt;
 /* helper routine to determine resync completion since MaxSector is a
  * moving target
  */
-static inline int is_resync_complete(struct active_array *a)
+static inline int is_resync_complete(struct mdinfo *array)
 {
-       if (a->resync_start >= a->info.component_size)
+       if (array->resync_start >= array->component_size)
                return 1;
        return 0;
 }