Pull fuse update from Miklos Szeredi: "This series adds cached writeback support to fuse, improving write throughput" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix "uninitialized variable" warning fuse: Turn writeback cache on fuse: Fix O_DIRECT operations vs cached writeback misorder fuse: fuse_flush() should wait on writeback fuse: Implement write_begin/write_end callbacks fuse: restructure fuse_readpage() fuse: Flush files on wb close fuse: Trust kernel i_mtime only fuse: Trust kernel i_size only fuse: Connection bit for enabling writeback fuse: Prepare to handle short reads fuse: Linking file to inode helper
Showing the changes to include/uapi/linux (1 of 6 files). Show all
Unified · Split
| @@ -93,6 +93,9 @@ · 92 unmodified lines | ||
| 93 | 93 | * |
| 94 | 94 | * 7.22 |
| 95 | 95 | * - add FUSE_ASYNC_DIO |
| 96 | + * | |
| 97 | + * 7.23 | |
| 98 | + * - add FUSE_WRITEBACK_CACHE | |
| 96 | 99 | */ |
| 97 | 100 | |
| 98 | 101 | #ifndef _LINUX_FUSE_H |
| @@ -128,7 +131,7 @@ · 29 unmodified lines | ||
| 128 | 131 | #define FUSE_KERNEL_VERSION 7 |
| 129 | 132 | |
| 130 | 133 | /** Minor version number of this interface */ |
| 131 | −#define FUSE_KERNEL_MINOR_VERSION 22 | |
| 134 | +#define FUSE_KERNEL_MINOR_VERSION 23 | |
| 132 | 135 | |
| 133 | 136 | /** The node ID of the root inode */ |
| 134 | 137 | #define FUSE_ROOT_ID 1 |
| @@ -219,6 +222,7 @@ struct fuse_file_lock { · 84 unmodified lines | ||
| 219 | 222 | * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one) |
| 220 | 223 | * FUSE_READDIRPLUS_AUTO: adaptive readdirplus |
| 221 | 224 | * FUSE_ASYNC_DIO: asynchronous direct I/O submission |
| 225 | + * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes | |
| 222 | 226 | */ |
| 223 | 227 | #define FUSE_ASYNC_READ (1 << 0) |
| 224 | 228 | #define FUSE_POSIX_LOCKS (1 << 1) |
| @@ -236,6 +240,7 @@ struct fuse_file_lock { · 11 unmodified lines | ||
| 236 | 240 | #define FUSE_DO_READDIRPLUS (1 << 13) |
| 237 | 241 | #define FUSE_READDIRPLUS_AUTO (1 << 14) |
| 238 | 242 | #define FUSE_ASYNC_DIO (1 << 15) |
| 243 | +#define FUSE_WRITEBACK_CACHE (1 << 16) | |
| 239 | 244 | |
| 240 | 245 | /** |
| 241 | 246 | * CUSE INIT request/reply flags |