Merge pull request #95 from trapexit/flags

move requesting of FUSE flags to init from cli args

src/init.cpp

@@ -33,9 +33,27 @@ namespace mergerfs
     void *
     init(struct fuse_conn_info *conn)
     {
+#ifdef FUSE_CAP_ASYNC_READ
+      conn->want |= FUSE_CAP_ASYNC_READ;
+#endif
 #ifdef FUSE_CAP_IOCTL_DIR
       conn->want |= FUSE_CAP_IOCTL_DIR;
 #endif
+#ifdef FUSE_CAP_ATOMIC_O_TRUNC
+      conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
+#endif
+#ifdef FUSE_CAP_BIG_WRITES
+      conn->want |= FUSE_CAP_BIG_WRITES;
+#endif
+#ifdef FUSE_CAP_SPLICE_WRITE
+      conn->want |= FUSE_CAP_SPLICE_WRITE;
+#endif
+#ifdef FUSE_CAP_SPLICE_READ
+      conn->want |= FUSE_CAP_SPLICE_READ;
+#endif
+#ifdef FUSE_CAP_SPLICE_MOVE
+      conn->want |= FUSE_CAP_SPLICE_MOVE;
+#endif
 
       return &config::get_writable();
     }

src/option_parser.cpp

@@ -94,12 +94,12 @@ static
 void
 set_default_options(struct fuse_args &args)
 {
-  set_option(args,"big_writes");
-  set_option(args,"splice_read");
-  set_option(args,"splice_write");
-  set_option(args,"splice_move");
+  //  set_option(args,"big_writes");
+  //  set_option(args,"splice_read");
+  //  set_option(args,"splice_write");
+  //  set_option(args,"splice_move");
   set_option(args,"auto_cache");
-  set_option(args,"atomic_o_trunc");
+  //  set_option(args,"atomic_o_trunc");
 }
 
 static