|
 |
22c213 |
From 6d62abb99b6b918f05f099b01a99f4326a69d650 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
Date: Mon, 27 Jan 2020 19:02:26 +0100
|
|
|
22c213 |
Subject: [PATCH 115/116] virtiofsd: add some options to the help message
|
|
|
22c213 |
MIME-Version: 1.0
|
|
|
22c213 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c213 |
Content-Transfer-Encoding: 8bit
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Message-id: <20200127190227.40942-112-dgilbert@redhat.com>
|
|
|
22c213 |
Patchwork-id: 93565
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 111/112] virtiofsd: add some options to the help message
|
|
|
22c213 |
Bugzilla: 1694164
|
|
|
22c213 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
|
22c213 |
|
|
|
22c213 |
Add following options to the help message:
|
|
|
22c213 |
- cache
|
|
|
22c213 |
- flock|no_flock
|
|
|
22c213 |
- norace
|
|
|
22c213 |
- posix_lock|no_posix_lock
|
|
|
22c213 |
- readdirplus|no_readdirplus
|
|
|
22c213 |
- timeout
|
|
|
22c213 |
- writeback|no_writeback
|
|
|
22c213 |
- xattr|no_xattr
|
|
|
22c213 |
|
|
|
22c213 |
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
|
22c213 |
|
|
|
22c213 |
dgilbert: Split cache, norace, posix_lock, readdirplus off
|
|
|
22c213 |
into our own earlier patches that added the options
|
|
|
22c213 |
|
|
|
22c213 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
(cherry picked from commit 1d59b1b210d7c3b0bdf4b10ebe0bb1fccfcb8b95)
|
|
|
22c213 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
tools/virtiofsd/helper.c | 10 +++++++++-
|
|
|
22c213 |
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
|
|
22c213 |
index f98d8f2..0801cf7 100644
|
|
|
22c213 |
--- a/tools/virtiofsd/helper.c
|
|
|
22c213 |
+++ b/tools/virtiofsd/helper.c
|
|
|
22c213 |
@@ -148,6 +148,8 @@ void fuse_cmdline_help(void)
|
|
|
22c213 |
" -o cache=<mode> cache mode. could be one of \"auto, "
|
|
|
22c213 |
"always, none\"\n"
|
|
|
22c213 |
" default: auto\n"
|
|
|
22c213 |
+ " -o flock|no_flock enable/disable flock\n"
|
|
|
22c213 |
+ " default: no_flock\n"
|
|
|
22c213 |
" -o log_level=<level> log level, default to \"info\"\n"
|
|
|
22c213 |
" level could be one of \"debug, "
|
|
|
22c213 |
"info, warn, err\"\n"
|
|
|
22c213 |
@@ -163,7 +165,13 @@ void fuse_cmdline_help(void)
|
|
|
22c213 |
" enable/disable readirplus\n"
|
|
|
22c213 |
" default: readdirplus except with "
|
|
|
22c213 |
"cache=none\n"
|
|
|
22c213 |
- );
|
|
|
22c213 |
+ " -o timeout=<number> I/O timeout (second)\n"
|
|
|
22c213 |
+ " default: depends on cache= option.\n"
|
|
|
22c213 |
+ " -o writeback|no_writeback enable/disable writeback cache\n"
|
|
|
22c213 |
+ " default: no_writeback\n"
|
|
|
22c213 |
+ " -o xattr|no_xattr enable/disable xattr\n"
|
|
|
22c213 |
+ " default: no_xattr\n"
|
|
|
22c213 |
+ );
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
static int fuse_helper_opt_proc(void *data, const char *arg, int key,
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|