[cifs-utils] manpage: update mount.cifs manpage with info about default version being mounted

Commit Message

Jeff Layton Oct. 29, 2017, 10:58 a.m. UTC

From: Jeff Layton <[e-mail]>

Signed-off-by: Jeff Layton <[e-mail]>
---
 mount.cifs.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

ronnie sahlberg Oct. 30, 2017, 8:13 a.m. UTC | #1

Reviewed-by: Ronnie Sahlberg <[e-mail]>


On Sun, Oct 29, 2017 at 8:58 PM, Jeff Layton <[e-mail]> wrote:
> From: Jeff Layton <[e-mail]>
>
> Signed-off-by: Jeff Layton <[e-mail]>
> ---
>  mount.cifs.rst | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/mount.cifs.rst b/mount.cifs.rst
> index 9714f795fe76..e70bf36fa32e 100644
> --- a/mount.cifs.rst
> +++ b/mount.cifs.rst
> @@ -517,7 +517,7 @@ prefixpath=arg
>  vers=arg
>    SMB protocol version. Allowed values are:
>
> -  - 1.0 - The classic CIFS/SMBv1 protocol. This is the default.
> +  - 1.0 - The classic CIFS/SMBv1 protocol.
>    - 2.0 - The SMBv2.002 protocol. This was initially introduced in
>      Windows Vista Service Pack 1, and Windows Server 2008. Note that
>      the initial release version of Windows Vista spoke a slightly
> @@ -529,6 +529,9 @@ vers=arg
>    Note too that while this option governs the protocol version used, not
>    all features of each version are available.
>
> +  In kernels v4.13 and later, the default is ``3.0``. In kernels prior to
> +  v4.13, the default is ``1.0``.
> +
>  --verbose
>    Print additional debugging information for the mount. Note that this
>    parameter must be specified before the ``-o`` . For example::
> @@ -857,4 +860,3 @@ Steve French
>  The maintainer of the Linux cifs vfs and the userspace tool mount.cifs
>  is Steve French. The Linux CIFS Mailing list is the preferred place to
>  ask questions regarding these programs.
> -
> \ No newline at end of file
> --
> 2.13.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to [e-mail]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Aurélien Aptel Oct. 30, 2017, 11:01 a.m. UTC | #2

Hi Jeff,

Jeff Layton <[e-mail]> writes:
> +  In kernels v4.13 and later, the default is ``3.0``. In kernels prior to
> +  v4.13, the default is ``1.0``.
> +

IIUC, the current default is actually to negotiate and automatically use
2.1 or above.

Patch

diff --git a/mount.cifs.rst b/mount.cifs.rst
index 9714f795fe76..e70bf36fa32e 100644
--- a/mount.cifs.rst
+++ b/mount.cifs.rst
@@ -517,7 +517,7 @@  prefixpath=arg
 vers=arg
   SMB protocol version. Allowed values are:
 
-  - 1.0 - The classic CIFS/SMBv1 protocol. This is the default.
+  - 1.0 - The classic CIFS/SMBv1 protocol.
   - 2.0 - The SMBv2.002 protocol. This was initially introduced in
     Windows Vista Service Pack 1, and Windows Server 2008. Note that
     the initial release version of Windows Vista spoke a slightly
@@ -529,6 +529,9 @@  vers=arg
   Note too that while this option governs the protocol version used, not
   all features of each version are available.
 
+  In kernels v4.13 and later, the default is ``3.0``. In kernels prior to
+  v4.13, the default is ``1.0``.
+
 --verbose
   Print additional debugging information for the mount. Note that this
   parameter must be specified before the ``-o`` . For example::
@@ -857,4 +860,3 @@  Steve French
 The maintainer of the Linux cifs vfs and the userspace tool mount.cifs
 is Steve French. The Linux CIFS Mailing list is the preferred place to
 ask questions regarding these programs.
-
\ No newline at end of file