[Virtio-fs] [PATCH 0/3] Add some option descriptions to help and man page

[Virtio-fs] [PATCH 0/3] Add some option descriptions to help and man page

[Masayoshi Mizuma]

From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

Add some options to the help message and man page so that
users can set them.

Masayoshi Mizuma (3):
  virtiofsd: add some options to the help message
  virtiofsd: add some options to the man page
  virtiofsd: remove --writeback option from the man page

 tools/virtiofsd/helper.c       | 26 +++++++++++++++++++++++---
 tools/virtiofsd/virtiofsd.texi | 24 ++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 5 deletions(-)

-- 
2.18.1

[Virtio-fs] [PATCH 1/3] virtiofsd: add some options to the help message

[Masayoshi Mizuma]

From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

Add following options to the help message:
- cache
- flock|no_flock
- norace
- posix_lock|no_posix_lock
- readdirplus|no_readdirplus
- timeout
- writeback|no_writeback
- xattr|no_xattr

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
 tools/virtiofsd/helper.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index bcb8c05063..339d806e7c 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -147,15 +147,35 @@ void fuse_cmdline_help(void)
            "    -f                         foreground operation\n"
            "    --daemonize                run in background\n"
            "    -s                         disable multi-threaded operation\n"
+           "    -o cache=<mode>            cache mode. could be one of \"auto, "
+           "always, none\"\n"
+           "                               default: auto\n"
            "    -o clone_fd                use separate fuse device fd for "
            "each thread\n"
            "                               (may improve performance)\n"
+           "    -o flock|no_flock          enable/disable flock\n"
+           "                               default: no_flock\n"
+           "    -o log_level=<level>       log level, default to \"info\"\n"
+           "                               level could be one of \"debug, "
+           "info, warn, err\"\n"
            "    -o max_idle_threads        the maximum number of idle worker "
            "threads\n"
            "                               allowed (default: 10)\n"
-           "    -o log_level=<level>       log level, default to \"info\"\n"
-           "                               level could be one of \"debug, "
-           "info, warn, err\"\n");
+           "    -o norace                  disable racy fallback\n"
+           "                               default: false\n"
+           "    -o posix_lock|no_posix_lock\n"
+           "                               enable/disable remote posix lock\n"
+           "                               default: posix_lock\n"
+           "    -o readdirplus|no_readdirplus\n"
+           "                               enable/disable readirplus\n"
+           "                               default: readdirplus\n"
+           "    -o timeout=<number>        I/O timeout (second)\n"
+           "                               default: depends on cache= option.\n"
+           "    -o writeback|no_writeback  enable/disable writeback cache\n"
+           "                               default: no_writeback\n"
+           "    -o xattr|no_xattr          enable/disable xattr\n"
+           "                               default: no_xattr\n"
+           );
 }
 
 static int fuse_helper_opt_proc(void *data, const char *arg, int key,
-- 
2.18.1

Re: [Virtio-fs] [PATCH 1/3] virtiofsd: add some options to the help message

[Dr. David Alan Gilbert]

* Masayoshi Mizuma (msys.mizuma@gmail.com) wrote:
> From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
> 
> Add following options to the help message:
> - cache
> - flock|no_flock
> - norace
> - posix_lock|no_posix_lock
> - readdirplus|no_readdirplus
> - timeout
> - writeback|no_writeback
> - xattr|no_xattr
> 
> Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Thanks, I've split this up, so where the option was added by one of our
own patches, that patch now includes the update to this function.
Which leaves just flock, timeout, writeback, and xattr in this patch.

> ---
>  tools/virtiofsd/helper.c | 26 +++++++++++++++++++++++---
>  1 file changed, 23 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
> index bcb8c05063..339d806e7c 100644
> --- a/tools/virtiofsd/helper.c
> +++ b/tools/virtiofsd/helper.c
> @@ -147,15 +147,35 @@ void fuse_cmdline_help(void)
>             "    -f                         foreground operation\n"
>             "    --daemonize                run in background\n"
>             "    -s                         disable multi-threaded operation\n"
> +           "    -o cache=<mode>            cache mode. could be one of \"auto, "
> +           "always, none\"\n"
> +           "                               default: auto\n"
>             "    -o clone_fd                use separate fuse device fd for "
>             "each thread\n"
>             "                               (may improve performance)\n"
> +           "    -o flock|no_flock          enable/disable flock\n"
> +           "                               default: no_flock\n"
> +           "    -o log_level=<level>       log level, default to \"info\"\n"
> +           "                               level could be one of \"debug, "
> +           "info, warn, err\"\n"
>             "    -o max_idle_threads        the maximum number of idle worker "
>             "threads\n"
>             "                               allowed (default: 10)\n"
> -           "    -o log_level=<level>       log level, default to \"info\"\n"
> -           "                               level could be one of \"debug, "
> -           "info, warn, err\"\n");
> +           "    -o norace                  disable racy fallback\n"
> +           "                               default: false\n"
> +           "    -o posix_lock|no_posix_lock\n"
> +           "                               enable/disable remote posix lock\n"
> +           "                               default: posix_lock\n"
> +           "    -o readdirplus|no_readdirplus\n"
> +           "                               enable/disable readirplus\n"
> +           "                               default: readdirplus\n"
> +           "    -o timeout=<number>        I/O timeout (second)\n"
> +           "                               default: depends on cache= option.\n"
> +           "    -o writeback|no_writeback  enable/disable writeback cache\n"
> +           "                               default: no_writeback\n"
> +           "    -o xattr|no_xattr          enable/disable xattr\n"
> +           "                               default: no_xattr\n"
> +           );
>  }
>  
>  static int fuse_helper_opt_proc(void *data, const char *arg, int key,
> -- 
> 2.18.1
> 
> 
> _______________________________________________
> Virtio-fs mailing list
> Virtio-fs@redhat.com
> https://www.redhat.com/mailman/listinfo/virtio-fs
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

[Virtio-fs] [PATCH 2/3] virtiofsd: add some options to the man page

[Masayoshi Mizuma]

From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

Add following options to the man page:
- flock|no_flock
- norace
- posix_lock|no_posix_lock
- readdirplus|no_readdirplus
- timeout
- writeback|no_writeback
- xattr|no_xattr

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
 tools/virtiofsd/virtiofsd.texi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tools/virtiofsd/virtiofsd.texi b/tools/virtiofsd/virtiofsd.texi
index eec7fbf4e6..76eb219676 100644
--- a/tools/virtiofsd/virtiofsd.texi
+++ b/tools/virtiofsd/virtiofsd.texi
@@ -34,12 +34,34 @@ Print version.
 Enable debug output.
 @item --syslog
 Print log messages to syslog instead of stderr.
+@item -o flock|no_flock
+enable/disable flock.
+The default is @var{no_flock}.
 @item -o log_level=@var{level}
 Print only log messages matching @var{level} or more severe.  @var{level} is
 one of @code{err}, @code{warn}, @code{info}, or @code{debug}.  The default is
 @var{info}.
+@item -o norace
+Disable racy fallback.
+The default is false.
+@item -o posix_lock|no_posix_lock
+Enable/Disable remote posix lock.
+The default is @var{posix_lock}.
+@item -o readdirplus|no_readdirplus
+Enable/Disable readdirplus.
+The default is @var{readdirplus}
 @item -o source=@var{path}
 Share host directory tree located at @var{path}.  This option is required.
+@item -o timeout=<number>
+I/O timeout (second).
+The default depends on cache= option.
+@item -o writeback|no_writeback
+Enable/Disable writeback cache. The cache alows the FUSE client
+to buffer and merge write requests.
+The default is @var{no_writeback}.
+@item -o xattr|no_xattr
+Enable/Disable Extended attributes (xattr) of the files and directories.
+The default is @var{no_xattr}.
 @item --socket-path=@var{path}, -o vhost_user_socket=@var{path}
 Listen on vhost-user UNIX domain socket at @var{path}.
 @item --fd=@var{fdnum}
-- 
2.18.1

Re: [Virtio-fs] [PATCH 2/3] virtiofsd: add some options to the man page

[Dr. David Alan Gilbert]

* Masayoshi Mizuma (msys.mizuma@gmail.com) wrote:
> From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
> 
> Add following options to the man page:
> - flock|no_flock
> - norace
> - posix_lock|no_posix_lock
> - readdirplus|no_readdirplus
> - timeout
> - writeback|no_writeback
> - xattr|no_xattr
> 
> Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Thanks, I've squashed this one and the next one down into the
 'add man page' commit.

Dave

> ---
>  tools/virtiofsd/virtiofsd.texi | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/tools/virtiofsd/virtiofsd.texi b/tools/virtiofsd/virtiofsd.texi
> index eec7fbf4e6..76eb219676 100644
> --- a/tools/virtiofsd/virtiofsd.texi
> +++ b/tools/virtiofsd/virtiofsd.texi
> @@ -34,12 +34,34 @@ Print version.
>  Enable debug output.
>  @item --syslog
>  Print log messages to syslog instead of stderr.
> +@item -o flock|no_flock
> +enable/disable flock.
> +The default is @var{no_flock}.
>  @item -o log_level=@var{level}
>  Print only log messages matching @var{level} or more severe.  @var{level} is
>  one of @code{err}, @code{warn}, @code{info}, or @code{debug}.  The default is
>  @var{info}.
> +@item -o norace
> +Disable racy fallback.
> +The default is false.
> +@item -o posix_lock|no_posix_lock
> +Enable/Disable remote posix lock.
> +The default is @var{posix_lock}.
> +@item -o readdirplus|no_readdirplus
> +Enable/Disable readdirplus.
> +The default is @var{readdirplus}
>  @item -o source=@var{path}
>  Share host directory tree located at @var{path}.  This option is required.
> +@item -o timeout=<number>
> +I/O timeout (second).
> +The default depends on cache= option.
> +@item -o writeback|no_writeback
> +Enable/Disable writeback cache. The cache alows the FUSE client
> +to buffer and merge write requests.
> +The default is @var{no_writeback}.
> +@item -o xattr|no_xattr
> +Enable/Disable Extended attributes (xattr) of the files and directories.
> +The default is @var{no_xattr}.
>  @item --socket-path=@var{path}, -o vhost_user_socket=@var{path}
>  Listen on vhost-user UNIX domain socket at @var{path}.
>  @item --fd=@var{fdnum}
> -- 
> 2.18.1
> 
> 
> _______________________________________________
> Virtio-fs mailing list
> Virtio-fs@redhat.com
> https://www.redhat.com/mailman/listinfo/virtio-fs
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

[Virtio-fs] [PATCH 3/3] virtiofsd: remove --writeback option from the man page

[Masayoshi Mizuma]

From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

'--writeback' options doesn't work for virtiofsd.
'-o writebck' works instead.

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
 tools/virtiofsd/virtiofsd.texi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/virtiofsd/virtiofsd.texi b/tools/virtiofsd/virtiofsd.texi
index 76eb219676..45f377d41e 100644
--- a/tools/virtiofsd/virtiofsd.texi
+++ b/tools/virtiofsd/virtiofsd.texi
@@ -73,8 +73,6 @@ Select the desired trade-off between coherency and performance.  @code{none}
 forbids the FUSE client from caching to achieve best coherency at the cost of
 performance.  @code{auto} acts similar to NFS with a 1 second metadata cache
 timeout.  @code{always} sets a long cache lifetime at the expense of coherency.
-@item --writeback
-Enable writeback cache, allowing the FUSE client to buffer and merge write requests.
 @end table
 @c man end
 
-- 
2.18.1