summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-07-05 11:20:00 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-05 23:52:57 -0700
commitc1cbc908731c8e55e60fecb97bb7b65b1bc578a6 (patch)
tree2b43d966ea18d62f48ef746236ca93b36f728daa
parent2e35a3eef66290e166344858ec548942428a478f (diff)
glusterfsd: Handle setting entry-timeout to 0.
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1034 (rename() is not atomic) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1034
-rw-r--r--glusterfsd/src/glusterfsd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 87cda65..bf0d092 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -325,7 +325,7 @@ _add_fuse_mount (xlator_t *graph)
if (cmd_args->fuse_attribute_timeout >= 0)
ret = dict_set_double (top->options, ZR_ATTR_TIMEOUT_OPT,
cmd_args->fuse_attribute_timeout);
- if (cmd_args->fuse_entry_timeout)
+ if (cmd_args->fuse_entry_timeout >= 0)
ret = dict_set_double (top->options, ZR_ENTRY_TIMEOUT_OPT,
cmd_args->fuse_entry_timeout);
@@ -1157,6 +1157,7 @@ main (int argc, char *argv[])
cmd_args->log_level = DEFAULT_LOG_LEVEL;
cmd_args->fuse_direct_io_mode_flag = 2;
cmd_args->fuse_attribute_timeout = -1;
+ cmd_args->fuse_entry_timeout = -1;
INIT_LIST_HEAD (&cmd_args->xlator_options);