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/cifsglob.h | |
| parent | 675f36fb1dfc14eb9f6136cbac505e819ae4be9d (diff) | |
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/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 2396456c4edc..c0a027ec63c8 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -152,6 +152,7 @@ struct cifs_cred { enum smb_version { Smb_1 = 1, + Smb_21, }; struct mid_q_entry; @@ -1122,4 +1123,7 @@ extern struct workqueue_struct *cifsiod_wq; #define SMB1_VERSION_STRING "1.0" extern struct smb_version_operations smb1_operations; extern struct smb_version_values smb1_values; +#define SMB21_VERSION_STRING "2.1" +extern struct smb_version_operations smb21_operations; +extern struct smb_version_values smb21_values; #endif /* _CIFS_GLOB_H */ |