History

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

Pull fuse updates from Miklos Szeredi: "This contains two patchsets from Maxim Patlasov. The first reworks the request throttling so that only async requests are throttled. Wakeup of waiting async requests is also optimized. The second series adds support for async processing of direct IO which optimizes direct IO and enables the use of the AIO userspace interface." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: add flag to turn on async direct IO fuse: truncate file if async dio failed fuse: optimize short direct reads fuse: enable asynchronous processing direct IO fuse: make fuse_direct_io() aware about AIO fuse: add support of async IO fuse: move fuse_release_user_pages() up fuse: optimize wake_up fuse: implement exclusive wakeup for blocked_waitq fuse: skip blocking on allocations of synchronous requests fuse: add flag fc->initialized fuse: make request allocations for background processing explicit

Linus Torvalds committed 13 years ago

Commit a26ea932 parents c818c77 60b9df77 files · +362 −72Browse files

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

Unified · Split

include/uapi/linux/fuse.h+6−1
@@ -90,6 +90,9 @@ · 89 unmodified lines
90 * 7.2190 * 7.21
91 * - add FUSE_READDIRPLUS91 * - add FUSE_READDIRPLUS
92 * - send the requested events in POLL request92 * - send the requested events in POLL request
93 *
94 * 7.22
95 * - add FUSE_ASYNC_DIO
93 */96 */
94 97
95#ifndef _LINUX_FUSE_H98#ifndef _LINUX_FUSE_H
@@ -125,7 +128,7 @@ · 29 unmodified lines
125#define FUSE_KERNEL_VERSION 7128#define FUSE_KERNEL_VERSION 7
126 129
127/** Minor version number of this interface */130/** Minor version number of this interface */
128#define FUSE_KERNEL_MINOR_VERSION 21131#define FUSE_KERNEL_MINOR_VERSION 22
129 132
130/** The node ID of the root inode */133/** The node ID of the root inode */
131#define FUSE_ROOT_ID 1134#define FUSE_ROOT_ID 1
@@ -215,6 +218,7 @@ struct fuse_file_lock { · 83 unmodified lines
215 * FUSE_AUTO_INVAL_DATA: automatically invalidate cached pages218 * FUSE_AUTO_INVAL_DATA: automatically invalidate cached pages
216 * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)219 * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)
217 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus220 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
221 * FUSE_ASYNC_DIO: asynchronous direct I/O submission
218 */222 */
219#define FUSE_ASYNC_READ (1 << 0)223#define FUSE_ASYNC_READ (1 << 0)
220#define FUSE_POSIX_LOCKS (1 << 1)224#define FUSE_POSIX_LOCKS (1 << 1)
@@ -231,6 +235,7 @@ struct fuse_file_lock { · 10 unmodified lines
231#define FUSE_AUTO_INVAL_DATA (1 << 12)235#define FUSE_AUTO_INVAL_DATA (1 << 12)
232#define FUSE_DO_READDIRPLUS (1 << 13)236#define FUSE_DO_READDIRPLUS (1 << 13)
233#define FUSE_READDIRPLUS_AUTO (1 << 14)237#define FUSE_READDIRPLUS_AUTO (1 << 14)
238#define FUSE_ASYNC_DIO (1 << 15)
234 239
235/**240/**
236 * CUSE INIT request/reply flags241 * CUSE INIT request/reply flags