Skip to content

Commit be13500

Browse files
smfrenchsmfrench
committed
smb3: move defines for query info and query fsinfo to smbfs_common
Includes moving to common code (from cifs and ksmbd protocol related headers) - query and query directory info levels and structs - set info structs - SMB2 lock struct and flags - SMB2 echo req Also shorten a few flag names (e.g. SMB2_LOCKFLAG_EXCLUSIVE_LOCK to SMB2_LOCKFLAG_EXCLUSIVE) Reviewed-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 15e7b6d commit be13500

5 files changed

Lines changed: 335 additions & 603 deletions

File tree

‎fs/cifs/cifspdu.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ struct smb_t2_rsp {
16461646
#define SMB_FIND_FILE_ID_FULL_DIR_INFO 0x105
16471647
#define SMB_FIND_FILE_ID_BOTH_DIR_INFO 0x106
16481648
#define SMB_FIND_FILE_UNIX 0x202
1649-
#define SMB_FIND_FILE_POSIX_INFO 0x064
1649+
/* #define SMB_FIND_FILE_POSIX_INFO 0x064 */
16501650

16511651
typedef struct smb_com_transaction2_qpi_req {
16521652
struct smb_hdr hdr; /* wct = 14+ */

‎fs/cifs/smb2ops.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5840,8 +5840,8 @@ struct smb_version_values smb20_values = {
58405840
.protocol_id = SMB20_PROT_ID,
58415841
.req_capabilities = 0, /* MBZ */
58425842
.large_lock_type = 0,
5843-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5844-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5843+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5844+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
58455845
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
58465846
.header_size = sizeof(struct smb2_hdr),
58475847
.header_preamble_size = 0,
@@ -5861,8 +5861,8 @@ struct smb_version_values smb21_values = {
58615861
.protocol_id = SMB21_PROT_ID,
58625862
.req_capabilities = 0, /* MBZ on negotiate req until SMB3 dialect */
58635863
.large_lock_type = 0,
5864-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5865-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5864+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5865+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
58665866
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
58675867
.header_size = sizeof(struct smb2_hdr),
58685868
.header_preamble_size = 0,
@@ -5882,8 +5882,8 @@ struct smb_version_values smb3any_values = {
58825882
.protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */
58835883
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
58845884
.large_lock_type = 0,
5885-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5886-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5885+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5886+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
58875887
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
58885888
.header_size = sizeof(struct smb2_hdr),
58895889
.header_preamble_size = 0,
@@ -5903,8 +5903,8 @@ struct smb_version_values smbdefault_values = {
59035903
.protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */
59045904
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
59055905
.large_lock_type = 0,
5906-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5907-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5906+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5907+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
59085908
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
59095909
.header_size = sizeof(struct smb2_hdr),
59105910
.header_preamble_size = 0,
@@ -5924,8 +5924,8 @@ struct smb_version_values smb30_values = {
59245924
.protocol_id = SMB30_PROT_ID,
59255925
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
59265926
.large_lock_type = 0,
5927-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5928-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5927+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5928+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
59295929
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
59305930
.header_size = sizeof(struct smb2_hdr),
59315931
.header_preamble_size = 0,
@@ -5945,8 +5945,8 @@ struct smb_version_values smb302_values = {
59455945
.protocol_id = SMB302_PROT_ID,
59465946
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
59475947
.large_lock_type = 0,
5948-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5949-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5948+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5949+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
59505950
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
59515951
.header_size = sizeof(struct smb2_hdr),
59525952
.header_preamble_size = 0,
@@ -5966,8 +5966,8 @@ struct smb_version_values smb311_values = {
59665966
.protocol_id = SMB311_PROT_ID,
59675967
.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
59685968
.large_lock_type = 0,
5969-
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
5970-
.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
5969+
.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE,
5970+
.shared_lock_type = SMB2_LOCKFLAG_SHARED,
59715971
.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
59725972
.header_size = sizeof(struct smb2_hdr),
59735973
.header_preamble_size = 0,

0 commit comments

Comments
 (0)