|
 |
1d442bb |
From: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
1d442bb |
Date: Mon, 27 Jan 2020 19:01:51 +0000
|
|
|
1d442bb |
Subject: [PATCH] virtiofsd: passthrough_ll: clean up cache related options
|
|
|
1d442bb |
MIME-Version: 1.0
|
|
|
1d442bb |
Content-Type: text/plain; charset=UTF-8
|
|
|
1d442bb |
Content-Transfer-Encoding: 8bit
|
|
|
1d442bb |
|
|
|
1d442bb |
- Rename "cache=never" to "cache=none" to match 9p's similar option.
|
|
|
1d442bb |
|
|
|
1d442bb |
- Rename CACHE_NORMAL constant to CACHE_AUTO to match the "cache=auto"
|
|
|
1d442bb |
option.
|
|
|
1d442bb |
|
|
|
1d442bb |
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
1d442bb |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1d442bb |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
1d442bb |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1d442bb |
(cherry picked from commit 230e777b5e250759ee0480fcc0e9ccfa2b082fba)
|
|
|
1d442bb |
---
|
|
|
1d442bb |
tools/virtiofsd/helper.c | 5 ++++-
|
|
|
1d442bb |
tools/virtiofsd/passthrough_ll.c | 20 ++++++++++----------
|
|
|
1d442bb |
2 files changed, 14 insertions(+), 11 deletions(-)
|
|
|
1d442bb |
|
|
|
1d442bb |
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
|
|
1d442bb |
index 14f5d70c10..567202444a 100644
|
|
|
1d442bb |
--- a/tools/virtiofsd/helper.c
|
|
|
1d442bb |
+++ b/tools/virtiofsd/helper.c
|
|
|
1d442bb |
@@ -145,6 +145,9 @@ void fuse_cmdline_help(void)
|
|
|
1d442bb |
" --syslog log to syslog (default stderr)\n"
|
|
|
1d442bb |
" -f foreground operation\n"
|
|
|
1d442bb |
" --daemonize run in background\n"
|
|
|
1d442bb |
+ " -o cache=<mode> cache mode. could be one of \"auto, "
|
|
|
1d442bb |
+ "always, none\"\n"
|
|
|
1d442bb |
+ " default: auto\n"
|
|
|
1d442bb |
" -o log_level=<level> log level, default to \"info\"\n"
|
|
|
1d442bb |
" level could be one of \"debug, "
|
|
|
1d442bb |
"info, warn, err\"\n"
|
|
|
1d442bb |
@@ -156,7 +159,7 @@ void fuse_cmdline_help(void)
|
|
|
1d442bb |
" -o readdirplus|no_readdirplus\n"
|
|
|
1d442bb |
" enable/disable readirplus\n"
|
|
|
1d442bb |
" default: readdirplus except with "
|
|
|
1d442bb |
- "cache=never\n"
|
|
|
1d442bb |
+ "cache=none\n"
|
|
|
1d442bb |
);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
index 9e7191eb75..b40f2874a7 100644
|
|
|
1d442bb |
--- a/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
@@ -101,8 +101,8 @@ struct lo_cred {
|
|
|
1d442bb |
};
|
|
|
1d442bb |
|
|
|
1d442bb |
enum {
|
|
|
1d442bb |
- CACHE_NEVER,
|
|
|
1d442bb |
- CACHE_NORMAL,
|
|
|
1d442bb |
+ CACHE_NONE,
|
|
|
1d442bb |
+ CACHE_AUTO,
|
|
|
1d442bb |
CACHE_ALWAYS,
|
|
|
1d442bb |
};
|
|
|
1d442bb |
|
|
|
1d442bb |
@@ -138,8 +138,8 @@ static const struct fuse_opt lo_opts[] = {
|
|
|
1d442bb |
{ "no_xattr", offsetof(struct lo_data, xattr), 0 },
|
|
|
1d442bb |
{ "timeout=%lf", offsetof(struct lo_data, timeout), 0 },
|
|
|
1d442bb |
{ "timeout=", offsetof(struct lo_data, timeout_set), 1 },
|
|
|
1d442bb |
- { "cache=never", offsetof(struct lo_data, cache), CACHE_NEVER },
|
|
|
1d442bb |
- { "cache=auto", offsetof(struct lo_data, cache), CACHE_NORMAL },
|
|
|
1d442bb |
+ { "cache=none", offsetof(struct lo_data, cache), CACHE_NONE },
|
|
|
1d442bb |
+ { "cache=auto", offsetof(struct lo_data, cache), CACHE_AUTO },
|
|
|
1d442bb |
{ "cache=always", offsetof(struct lo_data, cache), CACHE_ALWAYS },
|
|
|
1d442bb |
{ "norace", offsetof(struct lo_data, norace), 1 },
|
|
|
1d442bb |
{ "readdirplus", offsetof(struct lo_data, readdirplus_set), 1 },
|
|
|
1d442bb |
@@ -482,7 +482,7 @@ static void lo_init(void *userdata, struct fuse_conn_info *conn)
|
|
|
1d442bb |
fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n");
|
|
|
1d442bb |
conn->want |= FUSE_CAP_FLOCK_LOCKS;
|
|
|
1d442bb |
}
|
|
|
1d442bb |
- if ((lo->cache == CACHE_NEVER && !lo->readdirplus_set) ||
|
|
|
1d442bb |
+ if ((lo->cache == CACHE_NONE && !lo->readdirplus_set) ||
|
|
|
1d442bb |
lo->readdirplus_clear) {
|
|
|
1d442bb |
fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling readdirplus\n");
|
|
|
1d442bb |
conn->want &= ~FUSE_CAP_READDIRPLUS;
|
|
|
1d442bb |
@@ -1493,7 +1493,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
|
|
|
1d442bb |
fi->fh = fh;
|
|
|
1d442bb |
err = lo_do_lookup(req, parent, name, &e);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
- if (lo->cache == CACHE_NEVER) {
|
|
|
1d442bb |
+ if (lo->cache == CACHE_NONE) {
|
|
|
1d442bb |
fi->direct_io = 1;
|
|
|
1d442bb |
} else if (lo->cache == CACHE_ALWAYS) {
|
|
|
1d442bb |
fi->keep_cache = 1;
|
|
|
1d442bb |
@@ -1578,7 +1578,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
fi->fh = fh;
|
|
|
1d442bb |
- if (lo->cache == CACHE_NEVER) {
|
|
|
1d442bb |
+ if (lo->cache == CACHE_NONE) {
|
|
|
1d442bb |
fi->direct_io = 1;
|
|
|
1d442bb |
} else if (lo->cache == CACHE_ALWAYS) {
|
|
|
1d442bb |
fi->keep_cache = 1;
|
|
|
1d442bb |
@@ -2395,7 +2395,7 @@ int main(int argc, char *argv[])
|
|
|
1d442bb |
lo.root.next = lo.root.prev = &lo.root;
|
|
|
1d442bb |
lo.root.fd = -1;
|
|
|
1d442bb |
lo.root.fuse_ino = FUSE_ROOT_ID;
|
|
|
1d442bb |
- lo.cache = CACHE_NORMAL;
|
|
|
1d442bb |
+ lo.cache = CACHE_AUTO;
|
|
|
1d442bb |
|
|
|
1d442bb |
/*
|
|
|
1d442bb |
* Set up the ino map like this:
|
|
|
1d442bb |
@@ -2470,11 +2470,11 @@ int main(int argc, char *argv[])
|
|
|
1d442bb |
}
|
|
|
1d442bb |
if (!lo.timeout_set) {
|
|
|
1d442bb |
switch (lo.cache) {
|
|
|
1d442bb |
- case CACHE_NEVER:
|
|
|
1d442bb |
+ case CACHE_NONE:
|
|
|
1d442bb |
lo.timeout = 0.0;
|
|
|
1d442bb |
break;
|
|
|
1d442bb |
|
|
|
1d442bb |
- case CACHE_NORMAL:
|
|
|
1d442bb |
+ case CACHE_AUTO:
|
|
|
1d442bb |
lo.timeout = 1.0;
|
|
|
1d442bb |
break;
|
|
|
1d442bb |
|