diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-02-24 18:07:19 +0000 |
|---|---|---|
| committer | Pavel Shilovsky <pshilovsky@samba.org> | 2012-05-23 12:33:15 +0400 |
| commit | 1080ef758fb87f286b25277d8373e680a9e73363 (patch) | |
| tree | d15de03210e986f0acd64afecf930160df2ceaf2 /fs/cifs/Makefile | |
| parent | 675f36fb1dfc14eb9f6136cbac505e819ae4be9d (diff) | |
| download | linux-stable-1080ef758fb87f286b25277d8373e680a9e73363.tar.gz linux-stable-1080ef758fb87f286b25277d8373e680a9e73363.tar.bz2 linux-stable-1080ef758fb87f286b25277d8373e680a9e73363.zip | |
CIFS: Introduce SMB2 mounts as vers=2.1
As with Linux nfs client, which uses "nfsvers=" or "vers=" to
indicate which protocol to use for mount, specifying
"vers=2.1"
will force an SMB2 mount. When vers is not specified CIFS is used
"vers=1"
We can eventually autonegotiate down from SMB2 to CIFS
when SMB2 is stable enough to make it the default, but this
is for the future. At that time we could also implement a
"maxprotocol" mount option as smbclient and Samba have today,
but that would be premature until SMB2 is stable.
Intially the SMB2 Kconfig option will depend on "BROKEN"
until the merge is complete, and then be "EXPERIMENTAL"
When it is no longer experimental we can consider changing
the default protocol to attempt first.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/Makefile')
| -rw-r--r-- | fs/cifs/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/Makefile b/fs/cifs/Makefile index 0fe70258caf0..4b4127544349 100644 --- a/fs/cifs/Makefile +++ b/fs/cifs/Makefile @@ -15,3 +15,5 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o + +cifs-$(CONFIG_CIFS_SMB2) += smb2ops.o |