Commit 1149c846 authored by Steve French's avatar Steve French
Browse files

smb3: make query_on_disk_id open context consistent and move to common code 



cifs and ksmbd were using a slightly different version of the query_on_disk_id
struct which could be confusing. Use the ksmbd version of this struct, and
move it to common code.

Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent c09ba02c

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -2063,7 +2063,7 @@ create_reconnect_durable_buf(struct cifs_fid *fid) 
static void

parse_query_id_ctxt(struct create_context *cc, struct smb2_file_all_info *buf)

{

	struct create_on_disk_id *pdisk_id = (struct create_on_disk_id *)cc;

	struct create_disk_id_rsp *pdisk_id = (struct create_disk_id_rsp *)cc;



	cifs_dbg(FYI, "parse query id context 0x%llx 0x%llx\n",

		pdisk_id->DiskFileId, pdisk_id->VolumeId);

fs/cifs/smb2pdu.h

+0 −9
Original line number Diff line number Diff line
@@ -170,15 +170,6 @@ struct durable_reconnect_context_v2 { 
	__le32 Flags; /* see above DHANDLE_FLAG_PERSISTENT */

} __packed;



/* See MS-SMB2 2.2.14.2.9 */

struct create_on_disk_id {

	struct create_context ccontext;

	__u8   Name[8];

	__le64 DiskFileId;

	__le64 VolumeId;

	__u32  Reserved[4];

} __packed;



/* See MS-SMB2 2.2.14.2.12 */

struct durable_reconnect_context_v2_rsp {

	__le32 Timeout;

fs/ksmbd/smb2pdu.h

+0 −8
Original line number Diff line number Diff line
@@ -144,14 +144,6 @@ struct create_mxac_rsp { 
	__le32 MaximalAccess;

} __packed;



struct create_disk_id_rsp {

	struct create_context ccontext;

	__u8   Name[8];

	__le64 DiskFileId;

	__le64 VolumeId;

	__u8  Reserved[16];

} __packed;



/* equivalent of the contents of SMB3.1.1 POSIX open context response */

struct create_posix_rsp {

	struct create_context ccontext;

fs/smbfs_common/smb2pdu.h

+11 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,7 @@ struct create_posix { 


#define SMB2_LEASE_KEY_SIZE			16



/* See MS-SMB2 2.2.13.2.8 */

struct lease_context {

	__u8 LeaseKey[SMB2_LEASE_KEY_SIZE];

	__le32 LeaseState;
@@ -1188,6 +1189,7 @@ struct lease_context { 
	__le64 LeaseDuration;

} __packed;



/* See MS-SMB2 2.2.13.2.10 */

struct lease_context_v2 {

	__u8 LeaseKey[SMB2_LEASE_KEY_SIZE];

	__le32 LeaseState;
@@ -1211,6 +1213,15 @@ struct create_lease_v2 { 
	__u8   Pad[4];

} __packed;



/* See MS-SMB2 2.2.14.2.9 */

struct create_disk_id_rsp {

	struct create_context ccontext;

	__u8   Name[8];

	__le64 DiskFileId;

	__le64 VolumeId;

	__u8  Reserved[16];

} __packed;



/* See MS-SMB2 2.2.31 and 2.2.32 */

struct smb2_ioctl_req {

	struct smb2_hdr hdr;