History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

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

Linus Torvalds committed 12 years ago

Commit d15fee82 parents 56c225f f3846266 files · +384 −84Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/fuse.h+6−1
@@ -93,6 +93,9 @@ · 92 unmodified lines
93 *93 *
94 * 7.2294 * 7.22
95 * - add FUSE_ASYNC_DIO95 * - add FUSE_ASYNC_DIO
96 *
97 * 7.23
98 * - add FUSE_WRITEBACK_CACHE
96 */99 */
97 100
98#ifndef _LINUX_FUSE_H101#ifndef _LINUX_FUSE_H
@@ -128,7 +131,7 @@ · 29 unmodified lines
128#define FUSE_KERNEL_VERSION 7131#define FUSE_KERNEL_VERSION 7
129 132
130/** Minor version number of this interface */133/** Minor version number of this interface */
131#define FUSE_KERNEL_MINOR_VERSION 22134#define FUSE_KERNEL_MINOR_VERSION 23
132 135
133/** The node ID of the root inode */136/** The node ID of the root inode */
134#define FUSE_ROOT_ID 1137#define FUSE_ROOT_ID 1
@@ -219,6 +222,7 @@ struct fuse_file_lock { · 84 unmodified lines
219 * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)222 * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)
220 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus223 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
221 * FUSE_ASYNC_DIO: asynchronous direct I/O submission224 * FUSE_ASYNC_DIO: asynchronous direct I/O submission
225 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
222 */226 */
223#define FUSE_ASYNC_READ (1 << 0)227#define FUSE_ASYNC_READ (1 << 0)
224#define FUSE_POSIX_LOCKS (1 << 1)228#define FUSE_POSIX_LOCKS (1 << 1)
@@ -236,6 +240,7 @@ struct fuse_file_lock { · 11 unmodified lines
236#define FUSE_DO_READDIRPLUS (1 << 13)240#define FUSE_DO_READDIRPLUS (1 << 13)
237#define FUSE_READDIRPLUS_AUTO (1 << 14)241#define FUSE_READDIRPLUS_AUTO (1 << 14)
238#define FUSE_ASYNC_DIO (1 << 15)242#define FUSE_ASYNC_DIO (1 << 15)
243#define FUSE_WRITEBACK_CACHE (1 << 16)
239 244
240/**245/**
241 * CUSE INIT request/reply flags246 * CUSE INIT request/reply flags