From 5e57245e3feba65385fc100e0f2c3d1214d79915 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 21 Jan 2014 09:43:31 +1100 Subject: [PATCH] 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 --- mdmon.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mdmon.c b/mdmon.c index 8cd53d8..b84d4d9 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);