From: NeilBrown <neilb@suse.de>
Date: Mon, 20 Jan 2014 22:43:31 +0000 (+1100)
Subject: mdmon: don't complain about notifying parent when there is no need
X-Git-Tag: mdadm-3.3.1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e57245e3feba65385fc100e0f2c3d1214d79915;p=thirdparty%2Fmdadm.git

mdmon: don't complain about notifying parent when there is no need

When run with --foreground mdmon has no need to notify any
parent, so it shouldn't even try, let alone complain when it fails.

Also close an end of a pipe which is no longer used.

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

diff --git a/mdmon.c b/mdmon.c
index 8cd53d8b..b84d4d95 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -429,6 +429,7 @@ static int mdmon(char *devnm, int must_fork, int takeover)
 				wait(&status);
 				status = WEXITSTATUS(status);
 			}
+			close(pfd[0]);
 			return status;
 		}
 	} else
@@ -516,10 +517,12 @@ static int mdmon(char *devnm, int must_fork, int takeover)
 	container->sock = make_control_sock(devnm);
 
 	status = 0;
-	if (write(pfd[1], &status, sizeof(status)) < 0)
-		pr_err("failed to notify our parent: %d\n",
-			getppid());
-	close(pfd[1]);
+	if (pfd[1] >= 0) {
+		if (write(pfd[1], &status, sizeof(status)) < 0)
+			pr_err("failed to notify our parent: %d\n",
+			       getppid());
+		close(pfd[1]);
+	}
 
 	mlockall(MCL_CURRENT | MCL_FUTURE);