[PATCH] fuse: bump interface version

Change interface version to 7.4.

Following changes will need backward compatibility support, so store the minor
version returned by userspace.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 8f873e621f4107e9c3d40d00e21bfaabd848ed66..e5bc3f8eebd06a092f2f88343995fc13c870fcf4 100644 (file)
--- 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)
                if (req->misc.init_in_out.major != FUSE_KERNEL_VERSION)
                        fc->conn_error = 1;
 
+               fc->minor = req->misc.init_in_out.minor;
+
                /* After INIT reply is received other requests can go
                   out.  So do (FUSE_MAX_OUTSTANDING - 1) number of
                   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 0ea5301f86bee8b585d5b8b1085ac3199a674bb4..2d4835e54c908d7da619a73039b13512fcf530a0 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -272,6 +272,9 @@ struct fuse_conn {
        /** Is create not implemented by fs? */
        unsigned no_create : 1;
 
+       /** Negotiated minor version */
+       unsigned minor;
+
        /** Backing dev info */
        struct backing_dev_info bdi;
 };

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index b76b558b03d481376c6a41d75d42786a2dae168e..3c85f1a422cc93b885456541278bd052914f0b24 100644 (file)
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -14,7 +14,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 3
+#define FUSE_KERNEL_MINOR_VERSION 4
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1