diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2006-12-06 23:35:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:31 -0500 |
commit | e9168c189fd54171124b5d25644024d99869e6a8 (patch) | |
tree | 93f71fef2810a77f258cb842875cc758a34995c6 | |
parent | 48ed214d10ae3c3999af938970f7b5b58df77be3 (diff) |
[PATCH] fuse: update userspace interface to version 7.8
Add a flag to the RELEASE message which specifies that a FLUSH operation
should be performed as well. This interface update is needed for the FreeBSD
port, and doesn't actually touch the Linux implementation at all.
Also rename the unused 'flush_flags' in the FLUSH message to 'unused'.
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/linux/fuse.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 9fc48a674b82..76336327a941 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #define FUSE_KERNEL_VERSION 7 | 15 | #define FUSE_KERNEL_VERSION 7 |
16 | 16 | ||
17 | /** Minor version number of this interface */ | 17 | /** Minor version number of this interface */ |
18 | #define FUSE_KERNEL_MINOR_VERSION 7 | 18 | #define FUSE_KERNEL_MINOR_VERSION 8 |
19 | 19 | ||
20 | /** The node ID of the root inode */ | 20 | /** The node ID of the root inode */ |
21 | #define FUSE_ROOT_ID 1 | 21 | #define FUSE_ROOT_ID 1 |
@@ -92,6 +92,11 @@ struct fuse_file_lock { | |||
92 | #define FUSE_ASYNC_READ (1 << 0) | 92 | #define FUSE_ASYNC_READ (1 << 0) |
93 | #define FUSE_POSIX_LOCKS (1 << 1) | 93 | #define FUSE_POSIX_LOCKS (1 << 1) |
94 | 94 | ||
95 | /** | ||
96 | * Release flags | ||
97 | */ | ||
98 | #define FUSE_RELEASE_FLUSH (1 << 0) | ||
99 | |||
95 | enum fuse_opcode { | 100 | enum fuse_opcode { |
96 | FUSE_LOOKUP = 1, | 101 | FUSE_LOOKUP = 1, |
97 | FUSE_FORGET = 2, /* no reply */ | 102 | FUSE_FORGET = 2, /* no reply */ |
@@ -205,12 +210,13 @@ struct fuse_open_out { | |||
205 | struct fuse_release_in { | 210 | struct fuse_release_in { |
206 | __u64 fh; | 211 | __u64 fh; |
207 | __u32 flags; | 212 | __u32 flags; |
208 | __u32 padding; | 213 | __u32 release_flags; |
214 | __u64 lock_owner; | ||
209 | }; | 215 | }; |
210 | 216 | ||
211 | struct fuse_flush_in { | 217 | struct fuse_flush_in { |
212 | __u64 fh; | 218 | __u64 fh; |
213 | __u32 flush_flags; | 219 | __u32 unused; |
214 | __u32 padding; | 220 | __u32 padding; |
215 | __u64 lock_owner; | 221 | __u64 lock_owner; |
216 | }; | 222 | }; |