diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-09-26 02:28:15 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-10-03 08:01:29 -0700 |
| commit | 89de9adbf2b7d446abe9a27c8e384d205a996176 (patch) | |
| tree | dc5cf55b3bdb7afc3c7895835b8201912ef34f57 /xlators/mgmt/glusterd/src/glusterd-handler.c | |
| parent | 5ee6a5384ee298314e1ef50c293ad5cbc281c609 (diff) | |
Do not hardcode umount(8) path, emulate lazy umount
1) Use a system-dependent macro for umount(8) location instead of
relying on $PATH to find it, for security and portability sake.
2) Introduce gf_umount_lazy() to replace umount -l (-l for lazy) invocations,
which is only supported on Linux; On Linux behavior in unchanged. On other
systems, we fork an external process (umountd) that will take care of
periodically attempt to unmount, and optionally rmdir.
Backport of Ia91167c0652f8ddab85136324b08f87c5ac1edd51d
BUG: 1138897
Change-Id: I9d82c87e85af0dee79f2de39bc697c486b7103c8
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8863
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Csaba Henk <csaba@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 8e4071221de..cb10d4dcb3f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -2825,12 +2825,16 @@ __glusterd_handle_umount (rpcsvc_request_t *req) goto out; } - runinit (&runner); - runner_add_args (&runner, "umount", umnt_req.path, NULL); - if (umnt_req.lazy) - runner_add_arg (&runner, "-l"); synclock_unlock (&priv->big_lock); - rsp.op_ret = runner_run (&runner); + + if (umnt_req.lazy) { + rsp.op_ret = gf_umount_lazy (this->name, umnt_req.path, 0); + } else { + runinit (&runner); + runner_add_args (&runner, _PATH_UMOUNT, umnt_req.path, NULL); + rsp.op_ret = runner_run (&runner); + } + synclock_lock (&priv->big_lock); if (rsp.op_ret == 0) { if (realpath (umnt_req.path, mntp)) |