Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45714d65 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[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: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4633a22e

fs/fuse/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -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

fs/fuse/fuse_i.h

+3 −0
Original line number Diff line number Diff line
@@ -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;

};

include/linux/fuse.h

+1 −1
Original line number Diff line number Diff line
@@ -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