diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2006-01-06 03:19:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:55 -0500 |
commit | 45714d65618407bce1fd0271bc58303ce14b0785 (patch) | |
tree | f1f53819fc9dcc04fb9bc7145fcaddc6f8b81fe9 /fs | |
parent | 4633a22e7added835fd1d4b072dbcc4474aa3017 (diff) |
[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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/dev.c | 2 | ||||
-rw-r--r-- | fs/fuse/fuse_i.h | 3 |
2 files changed, 5 insertions, 0 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 | }; |