diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /include/linux/fuse.h | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/fuse.h')
| -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 |