diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-09-21 13:57:47 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-10-03 07:57:47 -0700 |
| commit | 473c34f895c49bf2bd327ece586d3613cd86c068 (patch) | |
| tree | 0facfd50720f62b298530a73bc0b55ffc5823ee8 /cli/src | |
| parent | baa6f0ad759af024e4731a0f3889fe857ae2f1bf (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.
BUG: 1129939
Change-Id: Ia91167c0652f8ddab85136324b08f87c5ac1e51d
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8649
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 'cli/src')
| -rw-r--r-- | cli/src/cli-xml-output.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 840ff32e52b..fce8724eeb4 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2931,7 +2931,8 @@ cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list, gf_log ("cli", GF_LOG_ERROR, "failed to mount glusterfs client"); ret = -1; - goto rm_dir; + rmdir (mountdir); + goto cont; } while (i < len) { @@ -2988,19 +2989,10 @@ cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list, } unmount: - runinit (&runner); - runner_add_args (&runner, "umount", -#if GF_LINUX_HOST_OS - "-l", -#endif - mountdir, NULL); - ret = runner_run_reuse (&runner); + ret = gf_umount_lazy ("cli", mountdir, 1); if (ret) - runner_log (&runner, "cli", GF_LOG_WARNING, "error executing"); - runner_end (&runner); - -rm_dir: - rmdir (mountdir); + gf_log ("cli", GF_LOG_WARNING, "error unmounting %s: %s", + mountdir, strerror (errno)); cont: /* </volQuota> */ |