diff options
| author |  Nikolaus Rath <Nikolaus@rath.org> | 2016-10-10 11:57:50 -0700 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2016-10-10 12:04:09 -0700 |
| commit | e1274ccc153a0168a1fc0f8138787452a56ad92c (patch) | |
| tree | fa90fe76cc8c0b2d59c7d8333d759b66031e5451 /lib/fuse_lowlevel.c | |
| parent | 2044df660f193d6eb26e2e5121fb33d2f1dcc145 (diff) | |
Make several -o NN options work again
In commit 2ed7af, we accidentally set the default values *after*
parsing the command line arguments.
Diffstat (limited to 'lib/fuse_lowlevel.c')
| -rw-r--r-- | lib/fuse_lowlevel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 2010728..7648788 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -1701,7 +1701,7 @@ static void do_interrupt(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) } static struct fuse_req *check_interrupt(struct fuse_session *se, - struct fuse_req *req) + struct fuse_req *req) { struct fuse_req *curr; @@ -2825,6 +2825,10 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, fprintf(stderr, "fuse: failed to allocate fuse object\n"); goto out1; } + se->conn.async_read = 1; + se->conn.max_write = UINT_MAX; + se->conn.max_readahead = UINT_MAX; + se->atomic_o_trunc = 0; /* Parse options */ mo = parse_mount_opts(args); @@ -2844,10 +2848,6 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, if (se->debug) fprintf(stderr, "FUSE library version: %s\n", PACKAGE_VERSION); - se->conn.async_read = 1; - se->conn.max_write = UINT_MAX; - se->conn.max_readahead = UINT_MAX; - se->atomic_o_trunc = 0; se->bufsize = getpagesize() + 0x1000; se->bufsize = se->bufsize < MIN_BUFSIZE ? MIN_BUFSIZE : se->bufsize; |