]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdmon: don't complain about notifying parent when there is no need
authorNeilBrown <neilb@suse.de>
Mon, 20 Jan 2014 22:43:31 +0000 (09:43 +1100)
committerNeilBrown <neilb@suse.de>
Mon, 20 Jan 2014 22:43:31 +0000 (09:43 +1100)
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>
mdmon.c

diff --git a/mdmon.c b/mdmon.c
index 8cd53d8b24be4cf0936f90943e397cbe1d1ae97e..b84d4d9520485c04e55e7ebaccc844e0e81f2f67 100644 (file)
--- 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);