Activate splice_read by default if write_buf is implemented.

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 4f355ce3c7af9b24b4eadc6ff631c4cec04a3dcf..5ddefdbc0de207ea952c9f0ca0bb24bdba85df92 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,10 @@
 Unreleased Changes
 ==================
 
+* For low-level file systems that implement the `write_buf` handler,
+  the `splice_read` option is now enabled by default. As usual, this
+  can be changed in the file system's `init` handler.
+
 * `fuse_session_new` now treats low-level options more consistently:
   First, options are used to modify FUSE defaults. Second, the file
   system may inspect and/or adjust the settings in its `init`

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 3b30b21b8f4b131ad066f90de44f6c2a19dd8247..d10191bd25511e470e9025a7266ad84cb6f76b68 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -1928,6 +1928,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
        if ((cond) && (f->conn.capable & (cap))) \
                f->conn.want |= (cap)
        LL_SET_DEFAULT(1, FUSE_CAP_ASYNC_READ);
+       LL_SET_DEFAULT(f->op.write_buf, FUSE_CAP_SPLICE_READ);
        LL_SET_DEFAULT(f->op.getlk && f->op.setlk,
                       FUSE_CAP_POSIX_LOCKS);
        LL_SET_DEFAULT(f->op.flock, FUSE_CAP_FLOCK_LOCKS);