[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 070/109] virtiofsd: passthrough_ll: control readdirplus
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH v2 070/109] virtiofsd: passthrough_ll: control readdirplus |
Date: |
Tue, 21 Jan 2020 12:23:54 +0000 |
From: Miklos Szeredi <address@hidden>
Signed-off-by: Miklos Szeredi <address@hidden>
---
tools/virtiofsd/helper.c | 3 +++
tools/virtiofsd/passthrough_ll.c | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index c8cb88afdd..36eb273d8e 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -154,6 +154,9 @@ 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\n"
);
}
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index ae364a4825..b15633a044 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -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;
}
--
2.24.1
- [PATCH v2 065/109] virtiofsd: Kill threads when queues are stopped, (continued)
- [PATCH v2 065/109] virtiofsd: Kill threads when queues are stopped, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 064/109] virtiofsd: Handle hard reboot, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 066/109] vhost-user: Print unexpected slave message types, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 067/109] contrib/libvhost-user: Protect slave fd with mutex, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 068/109] virtiofsd: passthrough_ll: add renameat2 support, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 069/109] virtiofsd: passthrough_ll: disable readdirplus on cache=never, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 071/109] virtiofsd: rename unref_inode() to unref_inode_lolocked(), Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 072/109] virtiofsd: fail when parent inode isn't known in lo_do_lookup(), Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 070/109] virtiofsd: passthrough_ll: control readdirplus,
Dr. David Alan Gilbert (git) <=
- [PATCH v2 073/109] virtiofsd: extract root inode init into setup_root(), Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 074/109] virtiofsd: passthrough_ll: clean up cache related options, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 075/109] virtiofsd: passthrough_ll: use hashtable, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 076/109] virtiofsd: Clean up inodes on destroy, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 077/109] virtiofsd: support nanosecond resolution for file timestamp, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 078/109] virtiofsd: fix error handling in main(), Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 079/109] virtiofsd: cleanup allocated resource in se, Dr. David Alan Gilbert (git), 2020/01/21