Merge tag 'fuse-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse updates from Miklos Szeredi:
 "As well as the usual bug fixes, this adds the following new features:

   - cached readdir and readlink

   - max I/O size increased from 128k to 1M

   - improved performance and scalability of request queues

   - copy_file_range support

  The only non-fuse bits are trivial cleanups of macros in
  <linux/bitops.h>"

* tag 'fuse-update-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (31 commits)
  fuse: enable caching of symlinks
  fuse: only invalidate atime in direct read
  fuse: don't need GETATTR after every READ
  fuse: allow fine grained attr cache invaldation
  bitops: protect variables in bit_clear_unless() macro
  bitops: protect variables in set_mask_bits() macro
  fuse: realloc page array
  fuse: add max_pages to init_out
  fuse: allocate page array more efficiently
  fuse: reduce size of struct fuse_inode
  fuse: use iversion for readdir cache verification
  fuse: use mtime for readdir cache verification
  fuse: add readdir cache version
  fuse: allow using readdir cache
  fuse: allow caching readdir
  fuse: extract fuse_emit() helper
  fuse: add FOPEN_CACHE_DIR
  fuse: split out readdir.c
  fuse: Use hash table to link processing request
  fuse: kill req->intr_unique
  ...

1 files changed, 72 insertions, 47 deletions

diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
index 92fa24c24c92..b4967d48bfda 100644
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -116,6 +116,12 @@
  *
  *  7.27
  *  - add FUSE_ABORT_ERROR
+ *
+ *  7.28
+ *  - add FUSE_COPY_FILE_RANGE
+ *  - add FOPEN_CACHE_DIR
+ *  - add FUSE_MAX_PAGES, add max_pages to init_out
+ *  - add FUSE_CACHE_SYMLINKS
  */
 
 #ifndef _LINUX_FUSE_H
@@ -151,7 +157,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 27
+#define FUSE_KERNEL_MINOR_VERSION 28
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -219,10 +225,12 @@ struct fuse_file_lock {
  * FOPEN_DIRECT_IO: bypass page cache for this open file
  * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
  * FOPEN_NONSEEKABLE: the file is not seekable
+ * FOPEN_CACHE_DIR: allow caching this directory
  */
 #define FOPEN_DIRECT_IO         (1 << 0)
 #define FOPEN_KEEP_CACHE        (1 << 1)
 #define FOPEN_NONSEEKABLE       (1 << 2)
+#define FOPEN_CACHE_DIR         (1 << 3)
 
 /**
  * INIT request/reply flags
@@ -249,6 +257,8 @@ struct fuse_file_lock {
  * FUSE_HANDLE_KILLPRIV: fs handles killing suid/sgid/cap on write/chown/trunc
  * FUSE_POSIX_ACL: filesystem supports posix acls
  * FUSE_ABORT_ERROR: reading the device after abort returns ECONNABORTED
+ * FUSE_MAX_PAGES: init_out.max_pages contains the max number of req pages
+ * FUSE_CACHE_SYMLINKS: cache READLINK responses
  */
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
@@ -272,6 +282,8 @@ struct fuse_file_lock {
 #define FUSE_HANDLE_KILLPRIV    (1 << 19)
 #define FUSE_POSIX_ACL          (1 << 20)
 #define FUSE_ABORT_ERROR        (1 << 21)
+#define FUSE_MAX_PAGES          (1 << 22)
+#define FUSE_CACHE_SYMLINKS     (1 << 23)
 
 /**
  * CUSE INIT request/reply flags
@@ -337,53 +349,54 @@ struct fuse_file_lock {
 #define FUSE_POLL_SCHEDULE_NOTIFY (1 << 0)
 
 enum fuse_opcode {
-        FUSE_LOOKUP        = 1,
-        FUSE_FORGET        = 2,  /* no reply */
-        FUSE_GETATTR       = 3,
-        FUSE_SETATTR       = 4,
-        FUSE_READLINK      = 5,
-        FUSE_SYMLINK       = 6,
-        FUSE_MKNOD         = 8,
-        FUSE_MKDIR         = 9,
-        FUSE_UNLINK        = 10,
-        FUSE_RMDIR         = 11,
-        FUSE_RENAME        = 12,
-        FUSE_LINK          = 13,
-        FUSE_OPEN          = 14,
-        FUSE_READ          = 15,
-        FUSE_WRITE         = 16,
-        FUSE_STATFS        = 17,
-        FUSE_RELEASE       = 18,
-        FUSE_FSYNC         = 20,
-        FUSE_SETXATTR      = 21,
-        FUSE_GETXATTR      = 22,
-        FUSE_LISTXATTR     = 23,
-        FUSE_REMOVEXATTR   = 24,
-        FUSE_FLUSH         = 25,
-        FUSE_INIT          = 26,
-        FUSE_OPENDIR       = 27,
-        FUSE_READDIR       = 28,
-        FUSE_RELEASEDIR    = 29,
-        FUSE_FSYNCDIR      = 30,
-        FUSE_GETLK         = 31,
-        FUSE_SETLK         = 32,
-        FUSE_SETLKW        = 33,
-        FUSE_ACCESS        = 34,
-        FUSE_CREATE        = 35,
-        FUSE_INTERRUPT     = 36,
-        FUSE_BMAP          = 37,
-        FUSE_DESTROY       = 38,
-        FUSE_IOCTL         = 39,
-        FUSE_POLL          = 40,
-        FUSE_NOTIFY_REPLY  = 41,
-        FUSE_BATCH_FORGET  = 42,
-        FUSE_FALLOCATE     = 43,
-        FUSE_READDIRPLUS   = 44,
-        FUSE_RENAME2       = 45,
-        FUSE_LSEEK         = 46,
+        FUSE_LOOKUP             = 1,
+        FUSE_FORGET             = 2,  /* no reply */
+        FUSE_GETATTR            = 3,
+        FUSE_SETATTR            = 4,
+        FUSE_READLINK           = 5,
+        FUSE_SYMLINK            = 6,
+        FUSE_MKNOD              = 8,
+        FUSE_MKDIR              = 9,
+        FUSE_UNLINK             = 10,
+        FUSE_RMDIR              = 11,
+        FUSE_RENAME             = 12,
+        FUSE_LINK               = 13,
+        FUSE_OPEN               = 14,
+        FUSE_READ               = 15,
+        FUSE_WRITE              = 16,
+        FUSE_STATFS             = 17,
+        FUSE_RELEASE            = 18,
+        FUSE_FSYNC              = 20,
+        FUSE_SETXATTR           = 21,
+        FUSE_GETXATTR           = 22,
+        FUSE_LISTXATTR          = 23,
+        FUSE_REMOVEXATTR        = 24,
+        FUSE_FLUSH              = 25,
+        FUSE_INIT               = 26,
+        FUSE_OPENDIR            = 27,
+        FUSE_READDIR            = 28,
+        FUSE_RELEASEDIR         = 29,
+        FUSE_FSYNCDIR           = 30,
+        FUSE_GETLK              = 31,
+        FUSE_SETLK              = 32,
+        FUSE_SETLKW             = 33,
+        FUSE_ACCESS             = 34,
+        FUSE_CREATE             = 35,
+        FUSE_INTERRUPT          = 36,
+        FUSE_BMAP               = 37,
+        FUSE_DESTROY            = 38,
+        FUSE_IOCTL              = 39,
+        FUSE_POLL               = 40,
+        FUSE_NOTIFY_REPLY       = 41,
+        FUSE_BATCH_FORGET       = 42,
+        FUSE_FALLOCATE          = 43,
+        FUSE_READDIRPLUS        = 44,
+        FUSE_RENAME2            = 45,
+        FUSE_LSEEK              = 46,
+        FUSE_COPY_FILE_RANGE    = 47,
 
         /* CUSE specific operations */
-        CUSE_INIT          = 4096,
+        CUSE_INIT               = 4096,
 };
 
 enum fuse_notify_code {
@@ -610,7 +623,9 @@ struct fuse_init_out {
         uint16_t        congestion_threshold;
         uint32_t        max_write;
         uint32_t        time_gran;
-        uint32_t        unused[9];
+        uint16_t        max_pages;
+        uint16_t        padding;
+        uint32_t        unused[8];
 };
 
 #define CUSE_INIT_INFO_MAX 4096
@@ -792,4 +807,14 @@ struct fuse_lseek_out {
         uint64_t        offset;
 };
 
+struct fuse_copy_file_range_in {
+        uint64_t        fh_in;
+        uint64_t        off_in;
+        uint64_t        nodeid_out;
+        uint64_t        fh_out;
+        uint64_t        off_out;
+        uint64_t        len;
+        uint64_t        flags;
+};
+
 #endif /* _LINUX_FUSE_H */