diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:53:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:53:27 -0700 |
| commit | 1d9a8a47d659f053abeca9ece45651b4d94780c8 (patch) | |
| tree | 5c61cba476fb073c8f6a250f6cda4b0a36628aea /include | |
| parent | f07767fd0f95c385108fa4c456a9cb216a424fec (diff) | |
| parent | a7c1b990f71574e077b94ce4582e2cf11cb891fe (diff) | |
| download | linux-3.10-1d9a8a47d659f053abeca9ece45651b4d94780c8.tar.gz linux-3.10-1d9a8a47d659f053abeca9ece45651b4d94780c8.tar.bz2 linux-3.10-1d9a8a47d659f053abeca9ece45651b4d94780c8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: implement nonseekable open
fuse: add include protectors
fuse: config description improvement
fuse: add missing fuse_request_free
fuse: fix SEEK_END incorrectness
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fuse.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 265635dc990..350fe9767bb 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -17,8 +17,14 @@ * - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in * - add blksize field to fuse_attr * - add file flags field to fuse_read_in and fuse_write_in + * + * 7.10 + * - add nonseekable open flag */ +#ifndef _LINUX_FUSE_H +#define _LINUX_FUSE_H + #include <asm/types.h> #include <linux/major.h> @@ -26,7 +32,7 @@ #define FUSE_KERNEL_VERSION 7 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 9 +#define FUSE_KERNEL_MINOR_VERSION 10 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 @@ -98,9 +104,11 @@ struct fuse_file_lock { * * FOPEN_DIRECT_IO: bypass page cache for this open file * FOPEN_KEEP_CACHE: don't invalidate the data cache on open + * FOPEN_NONSEEKABLE: the file is not seekable */ #define FOPEN_DIRECT_IO (1 << 0) #define FOPEN_KEEP_CACHE (1 << 1) +#define FOPEN_NONSEEKABLE (1 << 2) /** * INIT request/reply flags @@ -409,3 +417,5 @@ struct fuse_dirent { #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1)) #define FUSE_DIRENT_SIZE(d) \ FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) + +#endif /* _LINUX_FUSE_H */ |