From: Neil Brown <neilb@suse.de>
Date: Mon, 26 May 2008 23:18:36 +0000 (+1000)
Subject: Discard 'array_list' in mdmon
X-Git-Tag: devel~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d19760db0541a399e08f2b005d07e607400604d;p=thirdparty%2Fmdadm.git

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 c5ba2f4c..ae4ceb52 100644
--- 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 d013dc8f..c8a3341e 100644
--- 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 e83f4236..29349b7a 100644
--- 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;