From: NeilBrown <neilb@suse.de>
Date: Fri, 29 Jan 2010 00:33:01 +0000 (+1100)
Subject: mdmon: simplify try_kill_monitor
X-Git-Tag: mdadm-3.1.2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af7ca334874b86921c7fe76059f33bfddb209296;p=thirdparty%2Fmdadm.git

mdmon: simplify try_kill_monitor

After we SIGTERM the monitor we need to wait for it to finish up.
Rather than the complexity of waiting for every md array to be clean,
we can simply read from the sock connected to the monitor.
When the monitor dies, we will get EOF.  Before then we will block.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mdmon.c b/mdmon.c
index b2f35c2f..c66b06bf 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -179,8 +179,8 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
 {
 	char buf[100];
 	int fd;
-	struct mdstat_ent *mdstat;
 	int n;
+	long fl;
 
 	/* first rule of survival... don't off yourself */
 	if (pid == getpid())
@@ -201,13 +201,12 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
 
 	kill(pid, SIGTERM);
 
-	mdstat = mdstat_read(0, 0);
-	for ( ; mdstat; mdstat = mdstat->next)
-		if (is_container_member(mdstat, devname)) {
-			sprintf(buf, "/dev/%s", mdstat->dev);
-			WaitClean(buf, sock, 0);
-		}
-	free_mdstat(mdstat);
+	/* Wait for monitor to exit by reading from the socket, after
+	 * clearing the non-blocking flag */
+	fl = fcntl(sock, F_GETFL, 0);
+	fl &= ~O_NONBLOCK;
+	fcntl(sock, F_SETFL, fl);
+	read(sock, buf, 100);
 }
 
 void remove_pidfile(char *devname)