diff options
author | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:36 +1000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:36 +1000 |
commit | 5d19760db0541a399e08f2b005d07e607400604d (patch) | |
tree | 99885a353b32ee2996c95efc75ea4e049ea5604c | |
parent | ea6d09b063211c851441f407c286d179fd3a3baa (diff) | |
download | mdadm-5d19760db0541a399e08f2b005d07e607400604d.tar.gz mdadm-5d19760db0541a399e08f2b005d07e607400604d.tar.xz mdadm-5d19760db0541a399e08f2b005d07e607400604d.zip |
Discard 'array_list' in mdmon
The container has an ->arrays field that we should be using.
-rw-r--r-- | managemon.c | 7 | ||||
-rw-r--r-- | mdmon.c | 1 | ||||
-rw-r--r-- | mdmon.h | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/managemon.c b/managemon.c index c5ba2f4..ae4ceb5 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); @@ -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; @@ -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; |