diff options
Diffstat (limited to 'glusterfsd/src/glusterfsd.c')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index d2c15632111..60dbe619266 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -135,6 +135,8 @@ static struct argp_option gf_options[] = { {0, 0, 0, 0, "Fuse options:"}, {"disable-direct-io-mode", ARGP_DISABLE_DIRECT_IO_MODE_KEY, 0, 0, "Disable direct I/O mode in fuse kernel module"}, + {"enable-direct-io-mode", ARGP_ENABLE_DIRECT_IO_MODE_KEY, 0, 0, + "Force direct I/O mode in fuse kernel module"}, {"entry-timeout", ARGP_ENTRY_TIMEOUT_KEY, "SECONDS", 0, "Set entry timeout to SECONDS in fuse kernel module [default: 1]"}, {"attribute-timeout", ARGP_ATTRIBUTE_TIMEOUT_KEY, "SECONDS", 0, @@ -321,7 +323,7 @@ _add_fuse_mount (xlator_t *graph) /* On Darwin machines, O_APPEND is not handled, * which may corrupt the data */ - if (cmd_args->fuse_direct_io_mode_flag == _gf_true) { + if (cmd_args->fuse_direct_io_mode_flag == 1) { gf_log ("glusterfs", GF_LOG_DEBUG, "'direct-io-mode' in fuse causes data corruption " "if O_APPEND is used. disabling 'direct-io-mode'"); @@ -333,14 +335,19 @@ _add_fuse_mount (xlator_t *graph) cmd_args->non_local); #else /* ! DARWIN HOST OS */ - if (cmd_args->fuse_direct_io_mode_flag == _gf_true) { - ret = dict_set_static_ptr (top->options, ZR_DIRECT_IO_OPT, - "enable"); - } else { - ret = dict_set_static_ptr (top->options, ZR_DIRECT_IO_OPT, - "disable"); - } - + switch (cmd_args->fuse_direct_io_mode_flag) { + case 0: /* disable */ + ret = dict_set_static_ptr (top->options, ZR_DIRECT_IO_OPT, + "disable"); + break; + case 1: /* enable */ + ret = dict_set_static_ptr (top->options, ZR_DIRECT_IO_OPT, + "enable"); + break; + case 2: /* default */ + default: + break; + } #endif /* GF_DARWIN_HOST_OS */ graph->parents = CALLOC (1, sizeof (xlator_list_t)); @@ -825,9 +832,13 @@ parse_opts (int key, char *arg, struct argp_state *state) break; case ARGP_DISABLE_DIRECT_IO_MODE_KEY: - cmd_args->fuse_direct_io_mode_flag = _gf_false; - break; - + cmd_args->fuse_direct_io_mode_flag = 0; + break; + + case ARGP_ENABLE_DIRECT_IO_MODE_KEY: + cmd_args->fuse_direct_io_mode_flag = 1; + break; + case ARGP_ENTRY_TIMEOUT_KEY: d = 0.0; @@ -1064,7 +1075,7 @@ main (int argc, char *argv[]) /* parsing command line arguments */ cmd_args->log_level = DEFAULT_LOG_LEVEL; - cmd_args->fuse_direct_io_mode_flag = _gf_true; + cmd_args->fuse_direct_io_mode_flag = 2; INIT_LIST_HEAD (&cmd_args->xlator_options); |