aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/fuse/dev.c2
-rw-r--r--fs/fuse/fuse_i.h3
-rw-r--r--include/linux/fuse.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 8f873e621f41..e5bc3f8eebd0 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -178,6 +178,8 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
178 if (req->misc.init_in_out.major != FUSE_KERNEL_VERSION) 178 if (req->misc.init_in_out.major != FUSE_KERNEL_VERSION)
179 fc->conn_error = 1; 179 fc->conn_error = 1;
180 180
181 fc->minor = req->misc.init_in_out.minor;
182
181 /* After INIT reply is received other requests can go 183 /* After INIT reply is received other requests can go
182 out. So do (FUSE_MAX_OUTSTANDING - 1) number of 184 out. So do (FUSE_MAX_OUTSTANDING - 1) number of
183 up()s on outstanding_sem. The last up() is done in 185 up()s on outstanding_sem. The last up() is done in
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 0ea5301f86be..2d4835e54c90 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -272,6 +272,9 @@ struct fuse_conn {
272 /** Is create not implemented by fs? */ 272 /** Is create not implemented by fs? */
273 unsigned no_create : 1; 273 unsigned no_create : 1;
274 274
275 /** Negotiated minor version */
276 unsigned minor;
277
275 /** Backing dev info */ 278 /** Backing dev info */
276 struct backing_dev_info bdi; 279 struct backing_dev_info bdi;
277}; 280};
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index b76b558b03d4..3c85f1a422cc 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -14,7 +14,7 @@
14#define FUSE_KERNEL_VERSION 7 14#define FUSE_KERNEL_VERSION 7
15 15
16/** Minor version number of this interface */ 16/** Minor version number of this interface */
17#define FUSE_KERNEL_MINOR_VERSION 3 17#define FUSE_KERNEL_MINOR_VERSION 4
18 18
19/** The node ID of the root inode */ 19/** The node ID of the root inode */
20#define FUSE_ROOT_ID 1 20#define FUSE_ROOT_ID 1