From: Nikolaus Rath <Nikolaus@rath.org>
Date: Mon, 10 Oct 2016 18:57:50 +0000 (-0700)
Subject: Make several -o NN options work again
X-Git-Tag: fuse-3.0.0rc1~59
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1274ccc153a0168a1fc0f8138787452a56ad92c;p=qemu-gpiodev%2Flibfuse.git

Make several -o NN options work again

In commit 2ed7af, we accidentally set the default values *after*
parsing the command line arguments.
---

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;