902636
From 0f1d456fad4ba6a696eff8976b9fe8a0f251e1b5 Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:01:47 +0100
902636
Subject: [PATCH 076/116] virtiofsd: passthrough_ll: control readdirplus
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200127190227.40942-73-dgilbert@redhat.com>
902636
Patchwork-id: 93524
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 072/112] virtiofsd: passthrough_ll: control readdirplus
902636
Bugzilla: 1694164
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
902636
From: Miklos Szeredi <mszeredi@redhat.com>
902636
902636
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
902636
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit 59aef494be2d8d91055ff3f3a8eb13d9f32873d8)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/helper.c         | 4 ++++
902636
 tools/virtiofsd/passthrough_ll.c | 7 ++++++-
902636
 2 files changed, 10 insertions(+), 1 deletion(-)
902636
902636
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
902636
index 6d50a46..14f5d70 100644
902636
--- a/tools/virtiofsd/helper.c
902636
+++ b/tools/virtiofsd/helper.c
902636
@@ -153,6 +153,10 @@ void fuse_cmdline_help(void)
902636
            "                               allowed (default: 10)\n"
902636
            "    -o norace                  disable racy fallback\n"
902636
            "                               default: false\n"
902636
+           "    -o readdirplus|no_readdirplus\n"
902636
+           "                               enable/disable readirplus\n"
902636
+           "                               default: readdirplus except with "
902636
+           "cache=never\n"
902636
           );
902636
 }
902636
 
902636
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
902636
index 6480c51..8b1784f 100644
902636
--- a/tools/virtiofsd/passthrough_ll.c
902636
+++ b/tools/virtiofsd/passthrough_ll.c
902636
@@ -117,6 +117,8 @@ struct lo_data {
902636
     double timeout;
902636
     int cache;
902636
     int timeout_set;
902636
+    int readdirplus_set;
902636
+    int readdirplus_clear;
902636
     struct lo_inode root; /* protected by lo->mutex */
902636
     struct lo_map ino_map; /* protected by lo->mutex */
902636
     struct lo_map dirp_map; /* protected by lo->mutex */
902636
@@ -140,6 +142,8 @@ static const struct fuse_opt lo_opts[] = {
902636
     { "cache=auto", offsetof(struct lo_data, cache), CACHE_NORMAL },
902636
     { "cache=always", offsetof(struct lo_data, cache), CACHE_ALWAYS },
902636
     { "norace", offsetof(struct lo_data, norace), 1 },
902636
+    { "readdirplus", offsetof(struct lo_data, readdirplus_set), 1 },
902636
+    { "no_readdirplus", offsetof(struct lo_data, readdirplus_clear), 1 },
902636
     FUSE_OPT_END
902636
 };
902636
 static bool use_syslog = false;
902636
@@ -478,7 +482,8 @@ static void lo_init(void *userdata, struct fuse_conn_info *conn)
902636
         fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n");
902636
         conn->want |= FUSE_CAP_FLOCK_LOCKS;
902636
     }
902636
-    if (lo->cache == CACHE_NEVER) {
902636
+    if ((lo->cache == CACHE_NEVER && !lo->readdirplus_set) ||
902636
+        lo->readdirplus_clear) {
902636
         fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling readdirplus\n");
902636
         conn->want &= ~FUSE_CAP_READDIRPLUS;
902636
     }
902636
-- 
902636
1.8.3.1
902636