diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-01-14 18:00:46 +0100 |
|---|---|---|
| committer | Raghavendra Bhat <raghavendra@redhat.com> | 2015-02-04 04:06:45 -0800 |
| commit | 6c5007d944bc7feddb19d5245f134c5602940d7b (patch) | |
| tree | f77ecca1dec22cb434911f0a490d19ba8910672b /libglusterfs | |
| parent | 8fd0a88eed39e1f70f0057efb2f92564fb135186 (diff) | |
NetBSD portability fix: recover errno on runner error
Some time ago we introduced F_CLOSEM to efficiently close unused
file descriptors when using a runner. But since it also close the
file descriptor used to send back errno to glusterd, it got unable
to detect an error on execve().
Fix this by backing out F_CLOSEM usage.
BUG: 1138897
Change-Id: I147a0924e8b1721c2a5ff67c3b943579d3a03bf5
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/9448
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/run.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libglusterfs/src/run.c b/libglusterfs/src/run.c index 93fe12aed10..5d7f1d207b1 100644 --- a/libglusterfs/src/run.c +++ b/libglusterfs/src/run.c @@ -290,9 +290,6 @@ runner_start (runner_t *runner) } else ret = -1; #else /* !GF_LINUX_HOST_OS */ -#ifdef F_CLOSEM /* NetBSD */ - (void)fcntl(3, F_CLOSEM); -#else /* !F_CLOSEM */ struct rlimit rl; ret = getrlimit (RLIMIT_NOFILE, &rl); GF_ASSERT (ret == 0); @@ -301,7 +298,6 @@ runner_start (runner_t *runner) if (i != xpi[1]) close (i); } -#endif /* !F_CLOSEM */ #endif /* !GF_LINUX_HOST_OS */ } |