History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 12 years ago

Commit f139c742 parents bd695a5 26bcd8b136 files · +1148 −470Browse files

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

Unified · Split

include/uapi/linux/fuse.h+3−0
@@ -101,6 +101,7 @@ · 100 unmodified lines
101 * - add FATTR_CTIME101 * - add FATTR_CTIME
102 * - add ctime and ctimensec to fuse_setattr_in102 * - add ctime and ctimensec to fuse_setattr_in
103 * - add FUSE_RENAME2 request103 * - add FUSE_RENAME2 request
104 * - add FUSE_NO_OPEN_SUPPORT flag
104 */105 */
105 106
106#ifndef _LINUX_FUSE_H107#ifndef _LINUX_FUSE_H
@@ -229,6 +230,7 @@ struct fuse_file_lock { · 122 unmodified lines
229 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus230 * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
230 * FUSE_ASYNC_DIO: asynchronous direct I/O submission231 * FUSE_ASYNC_DIO: asynchronous direct I/O submission
231 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes232 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
233 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
232 */234 */
233#define FUSE_ASYNC_READ (1 << 0)235#define FUSE_ASYNC_READ (1 << 0)
234#define FUSE_POSIX_LOCKS (1 << 1)236#define FUSE_POSIX_LOCKS (1 << 1)
@@ -247,6 +249,7 @@ struct fuse_file_lock { · 12 unmodified lines
247#define FUSE_READDIRPLUS_AUTO (1 << 14)249#define FUSE_READDIRPLUS_AUTO (1 << 14)
248#define FUSE_ASYNC_DIO (1 << 15)250#define FUSE_ASYNC_DIO (1 << 15)
249#define FUSE_WRITEBACK_CACHE (1 << 16)251#define FUSE_WRITEBACK_CACHE (1 << 16)
252#define FUSE_NO_OPEN_SUPPORT (1 << 17)
250 253
251/**254/**
252 * CUSE INIT request/reply flags255 * CUSE INIT request/reply flags