From c1cbc908731c8e55e60fecb97bb7b65b1bc578a6 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Mon, 5 Jul 2010 11:20:00 +0000 Subject: glusterfsd: Handle setting entry-timeout to 0. Signed-off-by: Vijay Bellur Signed-off-by: Anand V. Avati BUG: 1034 (rename() is not atomic) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1034 --- glusterfsd/src/glusterfsd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 87cda657e2c..bf0d092b0fb 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); -- cgit