leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add SMB3.02 dialect support

Browse Source 
The new Windows update supports SMB3.02 dialect, a minor update to SMB3.
This patch adds support for mounting with vers=3.02

Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Steve French 2013-06-12 22:48:41 -05:00
parent 9cd2e62c49
commit 20b6d8b42e
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/cifs/cifsglob.h
View File

@ -175,6 +175,7 @@ enum smb_version {
Smb_20, Smb_20,
Smb_21, Smb_21,
Smb_30, Smb_30,
Smb_302,
}; };
struct mid_q_entry; struct mid_q_entry;
@ -1486,4 +1487,7 @@ extern struct smb_version_values smb21_values;
#define SMB30_VERSION_STRING "3.0" #define SMB30_VERSION_STRING "3.0"
extern struct smb_version_operations smb30_operations; extern struct smb_version_operations smb30_operations;
extern struct smb_version_values smb30_values; extern struct smb_version_values smb30_values;
#define SMB302_VERSION_STRING "3.02"
/*extern struct smb_version_operations smb302_operations;*/ /* not needed yet */
extern struct smb_version_values smb302_values;
#endif /* _CIFS_GLOB_H */ #endif /* _CIFS_GLOB_H */

5
fs/cifs/connect.c
View File

@ -276,6 +276,7 @@ static const match_table_t cifs_smb_version_tokens = {
{ Smb_20, SMB20_VERSION_STRING}, { Smb_20, SMB20_VERSION_STRING},
{ Smb_21, SMB21_VERSION_STRING }, { Smb_21, SMB21_VERSION_STRING },
{ Smb_30, SMB30_VERSION_STRING }, { Smb_30, SMB30_VERSION_STRING },
{ Smb_302, SMB302_VERSION_STRING },
}; };
static int ip_connect(struct TCP_Server_Info *server); static int ip_connect(struct TCP_Server_Info *server);
@ -1124,6 +1125,10 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol)
vol->ops = &smb30_operations; vol->ops = &smb30_operations;
vol->vals = &smb30_values; vol->vals = &smb30_values;
break; break;
case Smb_302:
vol->ops = &smb30_operations; /* currently identical with 3.0 */
vol->vals = &smb302_values;
break;
#endif #endif
default: default:
cifs_dbg(VFS, "Unknown vers= option specified: %s\n", value); cifs_dbg(VFS, "Unknown vers= option specified: %s\n", value);

18
fs/cifs/smb2ops.c
View File

@ -746,3 +746,21 @@ struct smb_version_values smb30_values = {
.cap_large_files = SMB2_LARGE_FILES, .cap_large_files = SMB2_LARGE_FILES,
.oplock_read = SMB2_OPLOCK_LEVEL_II, .oplock_read = SMB2_OPLOCK_LEVEL_II,
}; };
struct smb_version_values smb302_values = {
.version_string = SMB302_VERSION_STRING,
.protocol_id = SMB302_PROT_ID,
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU,
.large_lock_type = 0,
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
.header_size = sizeof(struct smb2_hdr),
.max_header_size = MAX_SMB2_HDR_SIZE,
.read_rsp_size = sizeof(struct smb2_read_rsp) - 1,
.lock_cmd = SMB2_LOCK,
.cap_unix = 0,
.cap_nt_find = SMB2_NT_FIND,
.cap_large_files = SMB2_LARGE_FILES,
.oplock_read = SMB2_OPLOCK_LEVEL_II,
};

2
fs/cifs/smb2pdu.c
View File

@ -386,6 +386,8 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
cifs_dbg(FYI, "negotiated smb2.1 dialect\n"); cifs_dbg(FYI, "negotiated smb2.1 dialect\n");
else if (rsp->DialectRevision == cpu_to_le16(SMB30_PROT_ID)) else if (rsp->DialectRevision == cpu_to_le16(SMB30_PROT_ID))
cifs_dbg(FYI, "negotiated smb3.0 dialect\n"); cifs_dbg(FYI, "negotiated smb3.0 dialect\n");
else if (rsp->DialectRevision == cpu_to_le16(SMB302_PROT_ID))
cifs_dbg(FYI, "negotiated smb3.02 dialect\n");
else { else {
cifs_dbg(VFS, "Illegal dialect returned by server %d\n", cifs_dbg(VFS, "Illegal dialect returned by server %d\n",
le16_to_cpu(rsp->DialectRevision)); le16_to_cpu(rsp->DialectRevision));

1
fs/cifs/smb2pdu.h
View File

@ -170,6 +170,7 @@ struct smb2_negotiate_req {
#define SMB20_PROT_ID 0x0202 #define SMB20_PROT_ID 0x0202
#define SMB21_PROT_ID 0x0210 #define SMB21_PROT_ID 0x0210
#define SMB30_PROT_ID 0x0300 #define SMB30_PROT_ID 0x0300
#define SMB302_PROT_ID 0x0302
#define BAD_PROT_ID 0xFFFF #define BAD_PROT_ID 0xFFFF
/* SecurityMode flags */ /* SecurityMode flags */