diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:16:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:16:14 -0400 |
| commit | 003386fff3e02e51cea882e60f7d28290113964c (patch) | |
| tree | 253001a9a0fc609b757362708edc2dcaab9e2a14 /include | |
| parent | 092405cdb66f060918160ae730640b449ed7b827 (diff) | |
| parent | 51921cb746f56983db5a373ca68deb2b0d3ddf01 (diff) | |
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:
mm: export generic_pipe_buf_*() to modules
fuse: support splice() reading from fuse device
fuse: allow splice to move pages
mm: export remove_from_page_cache() to modules
mm: export lru_cache_add_*() to modules
fuse: support splice() writing to fuse device
fuse: get page reference for readpages
fuse: use get_user_pages_fast()
fuse: remove unneeded variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fuse.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 3e2925a34bf0..88e0eb596919 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h | |||
| @@ -34,6 +34,9 @@ | |||
| 34 | * 7.13 | 34 | * 7.13 |
| 35 | * - make max number of background requests and congestion threshold | 35 | * - make max number of background requests and congestion threshold |
| 36 | * tunables | 36 | * tunables |
| 37 | * | ||
| 38 | * 7.14 | ||
| 39 | * - add splice support to fuse device | ||
| 37 | */ | 40 | */ |
| 38 | 41 | ||
| 39 | #ifndef _LINUX_FUSE_H | 42 | #ifndef _LINUX_FUSE_H |
| @@ -65,7 +68,7 @@ | |||
| 65 | #define FUSE_KERNEL_VERSION 7 | 68 | #define FUSE_KERNEL_VERSION 7 |
| 66 | 69 | ||
| 67 | /** Minor version number of this interface */ | 70 | /** Minor version number of this interface */ |
| 68 | #define FUSE_KERNEL_MINOR_VERSION 13 | 71 | #define FUSE_KERNEL_MINOR_VERSION 14 |
| 69 | 72 | ||
| 70 | /** The node ID of the root inode */ | 73 | /** The node ID of the root inode */ |
| 71 | #define FUSE_ROOT_ID 1 | 74 | #define FUSE_ROOT_ID 1 |