Merge pull request #624 from trapexit/parallel_dirops

ensure parallel dirops is enabled if capable

libfuse/include/fuse_common.h

@@ -101,19 +101,20 @@ struct fuse_file_info {
  * FUSE_CAP_SPLICE_READ: ability to use splice() to read from the fuse device
  * FUSE_CAP_IOCTL_DIR: ioctl support on directories
  */
-#define FUSE_CAP_ASYNC_READ	(1 << 0)
-#define FUSE_CAP_POSIX_LOCKS	(1 << 1)
-#define FUSE_CAP_ATOMIC_O_TRUNC	(1 << 3)
-#define FUSE_CAP_EXPORT_SUPPORT	(1 << 4)
-#define FUSE_CAP_BIG_WRITES	(1 << 5)
-#define FUSE_CAP_DONT_MASK	(1 << 6)
-#define FUSE_CAP_SPLICE_WRITE	(1 << 7)
-#define FUSE_CAP_SPLICE_MOVE	(1 << 8)
-#define FUSE_CAP_SPLICE_READ	(1 << 9)
-#define FUSE_CAP_FLOCK_LOCKS	(1 << 10)
-#define FUSE_CAP_IOCTL_DIR	(1 << 11)
-#define FUSE_CAP_ASYNC_DIO      (1 << 15)
-#define FUSE_CAP_POSIX_ACL      (1 << 19)
+#define FUSE_CAP_ASYNC_READ      (1 << 0)
+#define FUSE_CAP_POSIX_LOCKS     (1 << 1)
+#define FUSE_CAP_ATOMIC_O_TRUNC  (1 << 3)
+#define FUSE_CAP_EXPORT_SUPPORT  (1 << 4)
+#define FUSE_CAP_BIG_WRITES      (1 << 5)
+#define FUSE_CAP_DONT_MASK       (1 << 6)
+#define FUSE_CAP_SPLICE_WRITE    (1 << 7)
+#define FUSE_CAP_SPLICE_MOVE     (1 << 8)
+#define FUSE_CAP_SPLICE_READ     (1 << 9)
+#define FUSE_CAP_FLOCK_LOCKS     (1 << 10)
+#define FUSE_CAP_IOCTL_DIR       (1 << 11)
+#define FUSE_CAP_ASYNC_DIO       (1 << 15)
+#define FUSE_CAP_PARALLEL_DIROPS (1 << 18)
+#define FUSE_CAP_POSIX_ACL       (1 << 19)
 
 
 /**

libfuse/lib/fuse_lowlevel.c

@@ -1799,6 +1799,8 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
                         f->conn.capable |= FUSE_CAP_POSIX_ACL;
                 if (arg->flags & FUSE_ASYNC_DIO)
                         f->conn.capable |= FUSE_CAP_ASYNC_DIO;
+                if (arg->flags & FUSE_PARALLEL_DIROPS)
+                        f->conn.capable |= FUSE_CAP_PARALLEL_DIROPS;
 	} else {
 		f->conn.async_read = 0;
 		f->conn.max_readahead = 0;
@@ -1869,6 +1871,8 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
                 outarg.flags |= FUSE_POSIX_ACL;
         if (f->conn.want & FUSE_CAP_ASYNC_DIO)
                 outarg.flags |= FUSE_ASYNC_DIO;
+        if (f->conn.want & FUSE_CAP_PARALLEL_DIROPS)
+                outarg.flags |= FUSE_PARALLEL_DIROPS;
 	outarg.max_readahead = f->conn.max_readahead;
 	outarg.max_write = f->conn.max_write;
 	if (f->conn.proto_minor >= 13) {

src/fuse_init.cpp

@@ -43,6 +43,7 @@ namespace FUSE
     l::want_if_capable(conn_,FUSE_CAP_DONT_MASK);
     l::want_if_capable(conn_,FUSE_CAP_IOCTL_DIR);
     l::want_if_capable(conn_,FUSE_CAP_ASYNC_DIO);
+    l::want_if_capable(conn_,FUSE_CAP_PARALLEL_DIROPS);
     if(Config::get().posix_acl)
       l::want_if_capable(conn_,FUSE_CAP_POSIX_ACL);