diff options
| author | Amar Tumballi <amarts@redhat.com> | 2013-08-04 13:20:01 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-08-21 12:12:07 -0700 |
| commit | 271804a26ca73c2eab706eff4b3be9a62bec2b13 (patch) | |
| tree | ed9f0a3ce451ff3879c7861ea59392036ee27015 /glusterfsd | |
| parent | 51c6fa7a354826744de98a1c5c747955ae65850c (diff) | |
Revert "fuse: auxiliary gfid mount support"
This reverts commit 4c0f4c8a89039b1fa1c9c015fb6f273268164c20.
Conflicts:
xlators/mount/fuse/src/fuse-bridge.c
For build issues added CREATE_MODE_KEY definition in:
libglusterfs/src/glusterfs.h
Change-Id: I8093c2a0b5349b01e1ee6206025edbdbee43055e
BUG: 952029
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Reviewed-on: http://review.gluster.org/5495
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 19 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index ad0b29e7..d51ff4bc 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -146,10 +146,6 @@ static struct argp_option gf_options[] = { "Mount the filesystem with POSIX ACL support"}, {"selinux", ARGP_SELINUX_KEY, 0, 0, "Enable SELinux label (extened attributes) support on inodes"}, -#ifdef GF_LINUX_HOST_OS - {"aux-gfid-mount", ARGP_AUX_GFID_MOUNT_KEY, 0, 0, - "Enable access to filesystem through gfid directly"}, -#endif {"enable-ino32", ARGP_INODE32_KEY, "BOOL", OPTION_ARG_OPTIONAL, "Use 32-bit inodes when mounting to workaround broken applications" "that don't support 64-bit inodes"}, @@ -354,17 +350,6 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options) } } - if (cmd_args->aux_gfid_mount) { - ret = dict_set_static_ptr (options, "auxiliary-gfid-mount", - "on"); - if (ret < 0) { - gf_log ("glusterfsd", GF_LOG_ERROR, - "failed to set dict value for key " - "aux-gfid-mount"); - goto err; - } - } - if (cmd_args->enable_ino32) { ret = dict_set_static_ptr (options, "enable-ino32", "on"); if (ret < 0) { @@ -704,10 +689,6 @@ parse_opts (int key, char *arg, struct argp_state *state) "*-md-cache.cache-selinux=true"); break; - case ARGP_AUX_GFID_MOUNT_KEY: - cmd_args->aux_gfid_mount = 1; - break; - case ARGP_INODE32_KEY: cmd_args->enable_ino32 = 1; break; diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index 06b4aacc..be91ce54 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -85,7 +85,6 @@ enum argp_option_keys { ARGP_INODE32_KEY = 163, ARGP_FUSE_MOUNTOPTS_KEY = 164, ARGP_FUSE_USE_READDIRP_KEY = 165, - ARGP_AUX_GFID_MOUNT_KEY = 166, }; struct _gfd_vol_top_priv_t { |