1 files changed, 61 insertions, 4 deletions

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 9fbe9d258e22..d0c437028c80 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -6,7 +6,17 @@
     See the file COPYING.
 */
 
-/* This file defines the kernel interface of FUSE */
+/*
+ * This file defines the kernel interface of FUSE
+ *
+ * Protocol changelog:
+ *
+ * 7.9:
+ *  - new fuse_getattr_in input argument of GETATTR
+ *  - add lk_flags in fuse_lk_in
+ *  - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in
+ *  - add blksize field to fuse_attr
+ */
 
 #include <asm/types.h>
 #include <linux/major.h>
@@ -15,7 +25,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 8
+#define FUSE_KERNEL_MINOR_VERSION 9
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -44,6 +54,8 @@ struct fuse_attr {
         __u32   uid;
         __u32   gid;
         __u32   rdev;
+        __u32   blksize;
+        __u32   padding;
 };
 
 struct fuse_kstatfs {
@@ -76,6 +88,9 @@ struct fuse_file_lock {
 #define FATTR_ATIME     (1 << 4)
 #define FATTR_MTIME     (1 << 5)
 #define FATTR_FH        (1 << 6)
+#define FATTR_ATIME_NOW (1 << 7)
+#define FATTR_MTIME_NOW (1 << 8)
+#define FATTR_LOCKOWNER (1 << 9)
 
 /**
  * Flags returned by the OPEN request
@@ -91,12 +106,38 @@ struct fuse_file_lock {
  */
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
+#define FUSE_FILE_OPS           (1 << 2)
+#define FUSE_ATOMIC_O_TRUNC     (1 << 3)
 
 /**
  * Release flags
  */
 #define FUSE_RELEASE_FLUSH      (1 << 0)
 
+/**
+ * Getattr flags
+ */
+#define FUSE_GETATTR_FH         (1 << 0)
+
+/**
+ * Lock flags
+ */
+#define FUSE_LK_FLOCK           (1 << 0)
+
+/**
+ * WRITE flags
+ *
+ * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
+ * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
+ */
+#define FUSE_WRITE_CACHE        (1 << 0)
+#define FUSE_WRITE_LOCKOWNER    (1 << 1)
+
+/**
+ * Read flags
+ */
+#define FUSE_READ_LOCKOWNER     (1 << 1)
+
 enum fuse_opcode {
         FUSE_LOOKUP        = 1,
         FUSE_FORGET        = 2,  /* no reply */
@@ -139,6 +180,8 @@ enum fuse_opcode {
 /* The read buffer is required to be at least 8k, but may be much larger */
 #define FUSE_MIN_READ_BUFFER 8192
 
+#define FUSE_COMPAT_ENTRY_OUT_SIZE 120
+
 struct fuse_entry_out {
         __u64   nodeid;         /* Inode ID */
         __u64   generation;     /* Inode generation: nodeid:gen must
@@ -154,6 +197,14 @@ struct fuse_forget_in {
         __u64   nlookup;
 };
 
+struct fuse_getattr_in {
+        __u32   getattr_flags;
+        __u32   dummy;
+        __u64   fh;
+};
+
+#define FUSE_COMPAT_ATTR_OUT_SIZE 96
+
 struct fuse_attr_out {
         __u64   attr_valid;     /* Cache timeout for the attributes */
         __u32   attr_valid_nsec;
@@ -184,7 +235,7 @@ struct fuse_setattr_in {
         __u32   padding;
         __u64   fh;
         __u64   size;
-        __u64   unused1;
+        __u64   lock_owner;
         __u64   atime;
         __u64   mtime;
         __u64   unused2;
@@ -227,14 +278,18 @@ struct fuse_read_in {
         __u64   fh;
         __u64   offset;
         __u32   size;
-        __u32   padding;
+        __u32   read_flags;
+        __u64   lock_owner;
 };
 
+#define FUSE_COMPAT_WRITE_IN_SIZE 24
+
 struct fuse_write_in {
         __u64   fh;
         __u64   offset;
         __u32   size;
         __u32   write_flags;
+        __u64   lock_owner;
 };
 
 struct fuse_write_out {
@@ -273,6 +328,8 @@ struct fuse_lk_in {
         __u64   fh;
         __u64   owner;
         struct fuse_file_lock lk;
+        __u32   lk_flags;
+        __u32   padding;
 };
 
 struct fuse_lk_out {