diff options
author | Niels de Vos <ndevos@redhat.com> | 2012-09-03 13:34:22 +0200 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2013-02-07 13:38:20 -0800 |
commit | fbb9ad5030abf058ce75af1890b7ec1be77d22f9 (patch) | |
tree | 5895f7474ea5b728236e90216cf94805807a22b5 /glusterfsd | |
parent | 0f4bd1706f9243a0ae3569c47889ba7a784be23a (diff) |
mount/fuse: add mount-option "enable-ino32" for the native client
By default the GlusterFS-native client uses 64-bit inodes. Some 32-bit
applications can not handle these correctly. Introduce a client-side
mount option "enable-ino32" which causes the FUSE-client to squash the
64-bit inodes into a 32-bit value.
Change-Id: I7544010a27b7eb2d3b9fadb84ed934e4e7dff21e
BUG: 850352
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/3886
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 | 17 | ||||
-rw-r--r-- | glusterfsd/src/glusterfsd.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index ebd12bf0b99..5130bcf3460 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -154,6 +154,9 @@ 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"}, + {"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"}, {"worm", ARGP_WORM_KEY, 0, 0, "Mount the filesystem in 'worm' mode"}, {"mac-compat", ARGP_MAC_COMPAT_KEY, "BOOL", OPTION_ARG_OPTIONAL, @@ -359,6 +362,15 @@ create_fuse_mount (glusterfs_ctx_t *ctx) } } + if (cmd_args->enable_ino32) { + ret = dict_set_static_ptr (master->options, "enable-ino32", "on"); + if (ret < 0) { + gf_log ("glusterfsd", GF_LOG_ERROR, + "failed to set 'on' for key enable-ino32"); + goto err; + } + } + if (cmd_args->read_only) { ret = dict_set_static_ptr (master->options, "read-only", "on"); if (ret < 0) { @@ -579,6 +591,10 @@ parse_opts (int key, char *arg, struct argp_state *state) cmd_args->selinux = 1; break; + case ARGP_INODE32_KEY: + cmd_args->enable_ino32 = 1; + break; + case ARGP_WORM_KEY: cmd_args->worm = 1; break; @@ -1106,6 +1122,7 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx) cmd_args->log_level = DEFAULT_LOG_LEVEL; cmd_args->mac_compat = GF_OPTION_DISABLE; + cmd_args->enable_ino32 = GF_OPTION_DISABLE; #ifdef GF_DARWIN_HOST_OS /* On Darwin machines, O_APPEND is not handled, * which may corrupt the data diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index 8ec121954bb..d576121ce34 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -87,6 +87,7 @@ enum argp_option_keys { ARGP_USER_MAP_ROOT_KEY = 156, ARGP_MEM_ACCOUNTING_KEY = 157, ARGP_SELINUX_KEY = 158, + ARGP_INODE32_KEY = 159, }; struct _gfd_vol_top_priv_t { |