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