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

Message ID 20171031160224.12523-1-jlayton@kernel.org
State New
Headers show
Series
  • [cifs-utils,v2] manpage: update mount.cifs manpage with info about default version being mounted
Related show

Commit Message

Jeff Layton Oct. 31, 2017, 4:02 p.m.
From: Jeff Layton <jlayton@samba.org>

Signed-off-by: Jeff Layton <jlayton@samba.org>
---
 mount.cifs.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Thanks Aurelien. I dropped Ronnie's Reviewed-by since this is a bit different.
Let me know if you'd like me to add it back.

Comments

Pavel Shilovsky Oct. 31, 2017, 5:45 p.m. | #1
2017-10-31 9:02 GMT-07:00 Jeff Layton <jlayton@kernel.org>:
> From: Jeff Layton <jlayton@samba.org>
>
> Signed-off-by: Jeff Layton <jlayton@samba.org>
> ---
>  mount.cifs.rst | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> Thanks Aurelien. I dropped Ronnie's Reviewed-by since this is a bit different.
> Let me know if you'd like me to add it back.
>
> diff --git a/mount.cifs.rst b/mount.cifs.rst
> index 9714f795fe76..01305df60651 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 client and server negotiate a version greater
> +  than or equal to ``2.1``. In kernels prior to v4.13, the default is ``1.0``.
> +

The multi-dialect negotiation (version 2.1 and above) was added in
v4.13.5 kernel. Should we mention the specific stable version in the
doc?

--
Best regards,
Pavel Shilovsky
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Layton Nov. 4, 2017, 11:33 a.m. | #2
On Tue, 2017-10-31 at 10:45 -0700, Pavel Shilovsky wrote:
> 2017-10-31 9:02 GMT-07:00 Jeff Layton <jlayton@kernel.org>:
> > From: Jeff Layton <jlayton@samba.org>
> > 
> > Signed-off-by: Jeff Layton <jlayton@samba.org>
> > ---
> >  mount.cifs.rst | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > Thanks Aurelien. I dropped Ronnie's Reviewed-by since this is a bit different.
> > Let me know if you'd like me to add it back.
> > 
> > diff --git a/mount.cifs.rst b/mount.cifs.rst
> > index 9714f795fe76..01305df60651 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 client and server negotiate a version greater
> > +  than or equal to ``2.1``. In kernels prior to v4.13, the default is ``1.0``.
> > +
> 
> The multi-dialect negotiation (version 2.1 and above) was added in
> v4.13.5 kernel. Should we mention the specific stable version in the
> doc?
> 

It would be very odd to make that sort of change in a stable series
kernel. What patch actually flipped the default to autonegotiate?

I was assuming that it was eef914a9eb5eb83e60eb498315a491cd1edc13a1:

    $ git tag --contains eef914a9eb5eb83e60eb498315a491cd1edc13a1 | grep v4.13$
    v4.13

git says that that commit went into v4.13. Was it a different one?
Pavel Shilovsky Nov. 4, 2017, 4:44 p.m. | #3
2017-11-04 4:33 GMT-07:00 Jeff Layton <jlayton@kernel.org>:
> On Tue, 2017-10-31 at 10:45 -0700, Pavel Shilovsky wrote:
>> 2017-10-31 9:02 GMT-07:00 Jeff Layton <jlayton@kernel.org>:
>> > From: Jeff Layton <jlayton@samba.org>
>> >
>> > Signed-off-by: Jeff Layton <jlayton@samba.org>
>> > ---
>> >  mount.cifs.rst | 6 ++++--
>> >  1 file changed, 4 insertions(+), 2 deletions(-)
>> >
>> > Thanks Aurelien. I dropped Ronnie's Reviewed-by since this is a bit different.
>> > Let me know if you'd like me to add it back.
>> >
>> > diff --git a/mount.cifs.rst b/mount.cifs.rst
>> > index 9714f795fe76..01305df60651 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 client and server negotiate a version greater
>> > +  than or equal to ``2.1``. In kernels prior to v4.13, the default is ``1.0``.
>> > +
>>
>> The multi-dialect negotiation (version 2.1 and above) was added in
>> v4.13.5 kernel. Should we mention the specific stable version in the
>> doc?
>>
>
> It would be very odd to make that sort of change in a stable series
> kernel. What patch actually flipped the default to autonegotiate?
>
> I was assuming that it was eef914a9eb5eb83e60eb498315a491cd1edc13a1:
>
>     $ git tag --contains eef914a9eb5eb83e60eb498315a491cd1edc13a1 | grep v4.13$
>     v4.13
>
> git says that that commit went into v4.13. Was it a different one?
> --
> Jeff Layton <jlayton@kernel.org>

Yes, it was 9764c02fcbad40001fd3f63558d918e4d519bb75
(https://github.com/torvalds/linux/commit/9764c02fcbad40001fd3f63558d918e4d519bb75).

The one you mentioned changed the default from vers=1.0 to vers=3.0
which broke the existing setups against SMB 1.0 only servers. It was
done with subsequent auto-negotiate patch in mind. That's why the
latter patch should went to v4.13.y.

--
Best regards,
Pavel Shilovsky
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/mount.cifs.rst b/mount.cifs.rst
index 9714f795fe76..01305df60651 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 client and server negotiate a version greater
+  than or equal to ``2.1``. 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