aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Tej Chajed <tchajed@mit.edu>2017-04-13 17:23:33 -0400
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2017-04-14 13:29:18 -0700
commitbf76304abd936889f37f9613c199b6f147ba6700 (patch)
tree16a6633ebec91cf5698335d1d253a220816c8f16 /lib
parentacd0e6469a7270339119a4e350f73ba71a2903eb (diff)
Set default options before parsing
Diffstat (limited to 'lib')
-rw-r--r--lib/fuse.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fuse.c b/lib/fuse.c
index d08bc49..2ab5b55 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4610,6 +4610,11 @@ struct fuse *fuse_new(struct fuse_args *args,
goto out;
}
+ f->conf.entry_timeout = 1.0;
+ f->conf.attr_timeout = 1.0;
+ f->conf.negative_timeout = 0.0;
+ f->conf.intr_signal = FUSE_DEFAULT_INTR_SIGNAL;
+
/* Parse options */
if (fuse_opt_parse(args, &f->conf, fuse_lib_opts,
fuse_lib_opt_proc) == -1)
@@ -4648,11 +4653,6 @@ struct fuse *fuse_new(struct fuse_args *args,
llop.setlk = NULL;
}
- f->conf.entry_timeout = 1.0;
- f->conf.attr_timeout = 1.0;
- f->conf.negative_timeout = 0.0;
- f->conf.intr_signal = FUSE_DEFAULT_INTR_SIGNAL;
-
f->pagesize = getpagesize();
init_list_head(&f->partial_slabs);
init_list_head(&f->full_slabs);