Discard 'array_list' in mdmon

The container has an ->arrays field that we should be using.

diff --git a/managemon.c b/managemon.c
index c5ba2f4c40a7b4d88069f889a1723e9018212fae..ae4ceb5230b3873d2dfed5b7b9c9931286cd8b45 100644 (file)
--- a/managemon.c
+++ b/managemon.c
@@ -271,8 +271,7 @@ static void manage_new(struct mdstat_ent *mdstat,
        return;
 }
 
-void manage(struct mdstat_ent *mdstat, struct active_array *aa,
-           struct supertype *container)
+void manage(struct mdstat_ent *mdstat, struct supertype *container)
 {
        /* We have just read mdstat and need to compare it with
         * the known active arrays.
@@ -294,7 +293,7 @@ void manage(struct mdstat_ent *mdstat, struct active_array *aa,
                        /* Not for this array */
                        continue;
                /* Looks like a member of this container */
-               for (a = aa; a; a = a->next) {
+               for (a = container->arrays; a; a = a->next) {
                        if (mdstat->devnum == a->devnum) {
                                if (a->container)
                                        manage_member(mdstat, a);
@@ -374,7 +373,7 @@ void do_manager(struct supertype *container)
        do {
                mdstat = mdstat_read(1, 0);
 
-               manage(mdstat, array_list, container);
+               manage(mdstat, container);
 
                read_sock(container);
 

diff --git a/mdmon.c b/mdmon.c
index d013dc8ffc9749a643beb4430d2da2a042b9e57c..c8a3341effc59ac0338f513cb03b6edb0671bcf3 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -41,7 +41,6 @@
 #include       "mdadm.h"
 #include       "mdmon.h"
 
-struct active_array *array_list;
 struct active_array *discard_this;
 struct active_array *pending_discard;
 struct md_generic_cmd *active_cmd;

diff --git a/mdmon.h b/mdmon.h
index e83f42362259a7a35eb035b38bbad42533633f19..29349b7a8024c8c5cfb460c206f99e2b1df0e8ba 100644 (file)
--- a/mdmon.h
+++ b/mdmon.h
@@ -28,7 +28,6 @@ struct active_array {
 #define MD_MAJOR 9
 
 extern struct active_array *container;
-extern struct active_array *array_list;
 extern struct active_array *discard_this;
 extern struct active_array *pending_discard;
 extern struct md_generic_cmd *active_cmd;