History

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

Pull fuse updates from Miklos Szeredi. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: verify all ioctl retry iov elements fuse: add missing INIT flag descriptions fuse: add missing INIT flags fuse: update attributes on aio_read fuse: invalidate inode mapping if mtime changes fuse: add FUSE_AUTO_INVAL_DATA init flag

Linus Torvalds committed 14 years ago

Commit 2eac9eb2 parents ad54e46 fb6ccff4 files · +58 −11Browse files

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

Unified · Split

include/linux/fuse.h+18−1
@@ -57,6 +57,9 @@ · 56 unmodified lines
57 *57 *
58 * 7.1958 * 7.19
59 * - add FUSE_FALLOCATE59 * - add FUSE_FALLOCATE
60 *
61 * 7.20
62 * - add FUSE_AUTO_INVAL_DATA
60 */63 */
61 64
62#ifndef _LINUX_FUSE_H65#ifndef _LINUX_FUSE_H
@@ -88,7 +91,7 @@ · 25 unmodified lines
88#define FUSE_KERNEL_VERSION 791#define FUSE_KERNEL_VERSION 7
89 92
90/** Minor version number of this interface */93/** Minor version number of this interface */
91#define FUSE_KERNEL_MINOR_VERSION 1994#define FUSE_KERNEL_MINOR_VERSION 20
92 95
93/** The node ID of the root inode */96/** The node ID of the root inode */
94#define FUSE_ROOT_ID 197#define FUSE_ROOT_ID 1
@@ -163,10 +166,19 @@ struct fuse_file_lock { · 68 unmodified lines
163/**166/**
164 * INIT request/reply flags167 * INIT request/reply flags
165 *168 *
169 * FUSE_ASYNC_READ: asynchronous read requests
166 * FUSE_POSIX_LOCKS: remote locking for POSIX file locks170 * FUSE_POSIX_LOCKS: remote locking for POSIX file locks
171 * FUSE_FILE_OPS: kernel sends file handle for fstat, etc... (not yet supported)
172 * FUSE_ATOMIC_O_TRUNC: handles the O_TRUNC open flag in the filesystem
167 * FUSE_EXPORT_SUPPORT: filesystem handles lookups of "." and ".."173 * FUSE_EXPORT_SUPPORT: filesystem handles lookups of "." and ".."
174 * FUSE_BIG_WRITES: filesystem can handle write size larger than 4kB
168 * FUSE_DONT_MASK: don't apply umask to file mode on create operations175 * FUSE_DONT_MASK: don't apply umask to file mode on create operations
176 * FUSE_SPLICE_WRITE: kernel supports splice write on the device
177 * FUSE_SPLICE_MOVE: kernel supports splice move on the device
178 * FUSE_SPLICE_READ: kernel supports splice read on the device
169 * FUSE_FLOCK_LOCKS: remote locking for BSD style file locks179 * FUSE_FLOCK_LOCKS: remote locking for BSD style file locks
180 * FUSE_HAS_IOCTL_DIR: kernel supports ioctl on directories
181 * FUSE_AUTO_INVAL_DATA: automatically invalidate cached pages
170 */182 */
171#define FUSE_ASYNC_READ (1 << 0)183#define FUSE_ASYNC_READ (1 << 0)
172#define FUSE_POSIX_LOCKS (1 << 1)184#define FUSE_POSIX_LOCKS (1 << 1)
@@ -175,7 +187,12 @@ struct fuse_file_lock { · 2 unmodified lines
175#define FUSE_EXPORT_SUPPORT (1 << 4)187#define FUSE_EXPORT_SUPPORT (1 << 4)
176#define FUSE_BIG_WRITES (1 << 5)188#define FUSE_BIG_WRITES (1 << 5)
177#define FUSE_DONT_MASK (1 << 6)189#define FUSE_DONT_MASK (1 << 6)
190#define FUSE_SPLICE_WRITE (1 << 7)
191#define FUSE_SPLICE_MOVE (1 << 8)
192#define FUSE_SPLICE_READ (1 << 9)
178#define FUSE_FLOCK_LOCKS (1 << 10)193#define FUSE_FLOCK_LOCKS (1 << 10)
194#define FUSE_HAS_IOCTL_DIR (1 << 11)
195#define FUSE_AUTO_INVAL_DATA (1 << 12)
179 196
180/**197/**
181 * CUSE INIT request/reply flags198 * CUSE INIT request/reply flags