Commit d8d9de53 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: Move more definitions into the shared area 



Move SMB2_SessionSetup, SMB2_Close, SMB2_Read, SMB2_Write and
SMB2_ChangeNotify commands into smbfs_common/smb2pdu.h

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent fc0b3844

fs/cifs/smb2pdu.c

+35 −29
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_data *sess_data) 
		 * if reconnect, we need to send previous sess id

		 * otherwise it is 0

		 */

		req->PreviousSessionId = sess_data->previous_session;

		req->PreviousSessionId = cpu_to_le64(sess_data->previous_session);

		req->Flags = 0; /* MBZ */

	}
@@ -3234,8 +3234,8 @@ SMB2_close_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, 
	if (rc)

		return rc;



	req->PersistentFileId = persistent_fid;

	req->VolatileFileId = volatile_fid;

	req->PersistentFileId = cpu_to_le64(persistent_fid);

	req->VolatileFileId = cpu_to_le64(volatile_fid);

	if (query_attrs)

		req->Flags = SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB;

	else
@@ -3598,8 +3598,8 @@ SMB2_notify_init(const unsigned int xid, struct smb_rqst *rqst, 
	if (rc)

		return rc;



	req->PersistentFileId = persistent_fid;

	req->VolatileFileId = volatile_fid;

	req->PersistentFileId = cpu_to_le64(persistent_fid);

	req->VolatileFileId = cpu_to_le64(volatile_fid);

	/* See note 354 of MS-SMB2, 64K max */

	req->OutputBufferLength =

		cpu_to_le32(SMB2_MAX_BUFFER_SIZE - MAX_SMB2_HDR_SIZE);
@@ -3821,8 +3821,8 @@ SMB2_flush_init(const unsigned int xid, struct smb_rqst *rqst, 
	if (rc)

		return rc;



	req->PersistentFileId = persistent_fid;

	req->VolatileFileId = volatile_fid;

	req->PersistentFileId = cpu_to_le64(persistent_fid);

	req->VolatileFileId = cpu_to_le64(volatile_fid);



	iov[0].iov_base = (char *)req;

	iov[0].iov_len = total_len;
@@ -3888,7 +3888,7 @@ smb2_new_read_req(void **buf, unsigned int *total_len, 
	unsigned int remaining_bytes, int request_type)

{

	int rc = -EACCES;

	struct smb2_read_plain_req *req = NULL;

	struct smb2_read_req *req = NULL;

	struct smb2_hdr *shdr;

	struct TCP_Server_Info *server = io_parms->server;
@@ -3903,8 +3903,8 @@ smb2_new_read_req(void **buf, unsigned int *total_len, 
	shdr = &req->hdr;

	shdr->Id.SyncId.ProcessId = cpu_to_le32(io_parms->pid);



	req->PersistentFileId = io_parms->persistent_fid;

	req->VolatileFileId = io_parms->volatile_fid;

	req->PersistentFileId = cpu_to_le64(io_parms->persistent_fid);

	req->VolatileFileId = cpu_to_le64(io_parms->volatile_fid);

	req->ReadChannelInfoOffset = 0; /* reserved */

	req->ReadChannelInfoLength = 0; /* reserved */

	req->Channel = 0; /* reserved */
@@ -3938,7 +3938,7 @@ smb2_new_read_req(void **buf, unsigned int *total_len, 
		if (need_invalidate)

			req->Channel = SMB2_CHANNEL_RDMA_V1;

		req->ReadChannelInfoOffset =

			cpu_to_le16(offsetof(struct smb2_read_plain_req, Buffer));

			cpu_to_le16(offsetof(struct smb2_read_req, Buffer));

		req->ReadChannelInfoLength =

			cpu_to_le16(sizeof(struct smbd_buffer_descriptor_v1));

		v1 = (struct smbd_buffer_descriptor_v1 *) &req->Buffer[0];
@@ -3964,8 +3964,8 @@ smb2_new_read_req(void **buf, unsigned int *total_len, 
			 */

			shdr->SessionId = cpu_to_le64(0xFFFFFFFFFFFFFFFF);

			shdr->Id.SyncId.TreeId = cpu_to_le32(0xFFFFFFFF);

			req->PersistentFileId = 0xFFFFFFFFFFFFFFFF;

			req->VolatileFileId = 0xFFFFFFFFFFFFFFFF;

			req->PersistentFileId = cpu_to_le64(0xFFFFFFFFFFFFFFFF);

			req->VolatileFileId = cpu_to_le64(0xFFFFFFFFFFFFFFFF);

		}

	}

	if (remaining_bytes > io_parms->length)
@@ -4142,7 +4142,7 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, 
{

	struct smb_rqst rqst;

	int resp_buftype, rc;

	struct smb2_read_plain_req *req = NULL;

	struct smb2_read_req *req = NULL;

	struct smb2_read_rsp *rsp = NULL;

	struct kvec iov[1];

	struct kvec rsp_iov;
@@ -4176,19 +4176,22 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, 
		if (rc != -ENODATA) {

			cifs_stats_fail_inc(io_parms->tcon, SMB2_READ_HE);

			cifs_dbg(VFS, "Send error in read = %d\n", rc);

			trace_smb3_read_err(xid, req->PersistentFileId,

			trace_smb3_read_err(xid,

					    le64_to_cpu(req->PersistentFileId),

					    io_parms->tcon->tid, ses->Suid,

					    io_parms->offset, io_parms->length,

					    rc);

		} else

			trace_smb3_read_done(xid, req->PersistentFileId,

			trace_smb3_read_done(xid,

					     le64_to_cpu(req->PersistentFileId),

					     io_parms->tcon->tid, ses->Suid,

					     io_parms->offset, 0);

		free_rsp_buf(resp_buftype, rsp_iov.iov_base);

		cifs_small_buf_release(req);

		return rc == -ENODATA ? 0 : rc;

	} else

		trace_smb3_read_done(xid, req->PersistentFileId,

		trace_smb3_read_done(xid,

				     le64_to_cpu(req->PersistentFileId),

				    io_parms->tcon->tid, ses->Suid,

				    io_parms->offset, io_parms->length);
@@ -4330,8 +4333,8 @@ smb2_async_writev(struct cifs_writedata *wdata, 
	shdr = (struct smb2_hdr *)req;

	shdr->Id.SyncId.ProcessId = cpu_to_le32(wdata->cfile->pid);



	req->PersistentFileId = wdata->cfile->fid.persistent_fid;

	req->VolatileFileId = wdata->cfile->fid.volatile_fid;

	req->PersistentFileId = cpu_to_le64(wdata->cfile->fid.persistent_fid);

	req->VolatileFileId = cpu_to_le64(wdata->cfile->fid.volatile_fid);

	req->WriteChannelInfoOffset = 0;

	req->WriteChannelInfoLength = 0;

	req->Channel = 0;
@@ -4428,7 +4431,8 @@ smb2_async_writev(struct cifs_writedata *wdata, 
			     wdata, flags, &wdata->credits);



	if (rc) {

		trace_smb3_write_err(0 /* no xid */, req->PersistentFileId,

		trace_smb3_write_err(0 /* no xid */,

				     le64_to_cpu(req->PersistentFileId),

				     tcon->tid, tcon->ses->Suid, wdata->offset,

				     wdata->bytes, rc);

		kref_put(&wdata->refcount, release);
@@ -4481,8 +4485,8 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, 


	req->hdr.Id.SyncId.ProcessId = cpu_to_le32(io_parms->pid);



	req->PersistentFileId = io_parms->persistent_fid;

	req->VolatileFileId = io_parms->volatile_fid;

	req->PersistentFileId = cpu_to_le64(io_parms->persistent_fid);

	req->VolatileFileId = cpu_to_le64(io_parms->volatile_fid);

	req->WriteChannelInfoOffset = 0;

	req->WriteChannelInfoLength = 0;

	req->Channel = 0;
@@ -4510,7 +4514,8 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, 
	rsp = (struct smb2_write_rsp *)rsp_iov.iov_base;



	if (rc) {

		trace_smb3_write_err(xid, req->PersistentFileId,

		trace_smb3_write_err(xid,

				     le64_to_cpu(req->PersistentFileId),

				     io_parms->tcon->tid,

				     io_parms->tcon->ses->Suid,

				     io_parms->offset, io_parms->length, rc);
@@ -4518,7 +4523,8 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, 
		cifs_dbg(VFS, "Send error in write = %d\n", rc);

	} else {

		*nbytes = le32_to_cpu(rsp->DataLength);

		trace_smb3_write_done(xid, req->PersistentFileId,

		trace_smb3_write_done(xid,

				      le64_to_cpu(req->PersistentFileId),

				      io_parms->tcon->tid,

				      io_parms->tcon->ses->Suid,

				      io_parms->offset, *nbytes);

fs/cifs/smb2pdu.h

+0 −197
Original line number Diff line number Diff line
@@ -115,48 +115,6 @@ struct share_redirect_error_context_rsp { 
	/* __u8 ResourceName[] */ /* Name of share as counted Unicode string */

} __packed;



/* Flags */

#define SMB2_SESSION_REQ_FLAG_BINDING		0x01

#define SMB2_SESSION_REQ_FLAG_ENCRYPT_DATA	0x04



struct smb2_sess_setup_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 25 */

	__u8   Flags;

	__u8   SecurityMode;

	__le32 Capabilities;

	__le32 Channel;

	__le16 SecurityBufferOffset;

	__le16 SecurityBufferLength;

	__u64 PreviousSessionId;

	__u8   Buffer[1];	/* variable length GSS security buffer */

} __packed;



/* Currently defined SessionFlags */

#define SMB2_SESSION_FLAG_IS_GUEST	0x0001

#define SMB2_SESSION_FLAG_IS_NULL	0x0002

#define SMB2_SESSION_FLAG_ENCRYPT_DATA	0x0004

struct smb2_sess_setup_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 9 */

	__le16 SessionFlags;

	__le16 SecurityBufferOffset;

	__le16 SecurityBufferLength;

	__u8   Buffer[1];	/* variable length GSS security buffer */

} __packed;



struct smb2_logoff_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 4 */

	__le16 Reserved;

} __packed;



struct smb2_logoff_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 4 */

	__le16 Reserved;

} __packed;



/* File Attrubutes */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002
@@ -720,161 +678,6 @@ struct smb2_ioctl_rsp { 
	/* char * buffer[] */

} __packed;



/* Currently defined values for close flags */

#define SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB	cpu_to_le16(0x0001)

struct smb2_close_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 24 */

	__le16 Flags;

	__le32 Reserved;

	__u64  PersistentFileId; /* opaque endianness */

	__u64  VolatileFileId; /* opaque endianness */

} __packed;



/*

 * Maximum size of a SMB2_CLOSE response is 64 (smb2 header) + 60 (data)

 */

#define MAX_SMB2_CLOSE_RESPONSE_SIZE 124



struct smb2_close_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* 60 */

	__le16 Flags;

	__le32 Reserved;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 AllocationSize;	/* Beginning of FILE_STANDARD_INFO equivalent */

	__le64 EndOfFile;

	__le32 Attributes;

} __packed;



struct smb2_flush_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 24 */

	__le16 Reserved1;

	__le32 Reserved2;

	__u64  PersistentFileId; /* opaque endianness */

	__u64  VolatileFileId; /* opaque endianness */

} __packed;



struct smb2_flush_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize;

	__le16 Reserved;

} __packed;



/* For read request Flags field below, following flag is defined for SMB3.02 */

#define SMB2_READFLAG_READ_UNBUFFERED	0x01

#define SMB2_READFLAG_REQUEST_COMPRESSED 0x02 /* See MS-SMB2 2.2.19 */



/* Channel field for read and write: exactly one of following flags can be set*/

#define SMB2_CHANNEL_NONE	cpu_to_le32(0x00000000)

#define SMB2_CHANNEL_RDMA_V1	cpu_to_le32(0x00000001) /* SMB3 or later */

#define SMB2_CHANNEL_RDMA_V1_INVALIDATE cpu_to_le32(0x00000002) /* >= SMB3.02 */

#define SMB2_CHANNEL_RDMA_TRANSFORM cpu_to_le32(0x00000003) /* >= SMB3.02, only used on write */



/* SMB2 read request without RFC1001 length at the beginning */

struct smb2_read_plain_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 49 */

	__u8   Padding; /* offset from start of SMB2 header to place read */

	__u8   Flags; /* MBZ unless SMB3.02 or later */

	__le32 Length;

	__le64 Offset;

	__u64  PersistentFileId; /* opaque endianness */

	__u64  VolatileFileId; /* opaque endianness */

	__le32 MinimumCount;

	__le32 Channel; /* MBZ except for SMB3 or later */

	__le32 RemainingBytes;

	__le16 ReadChannelInfoOffset;

	__le16 ReadChannelInfoLength;

	__u8   Buffer[1];

} __packed;



/* Read flags */

#define SMB2_READFLAG_RESPONSE_NONE	0x00000000

#define SMB2_READFLAG_RESPONSE_RDMA_TRANSFORM	0x00000001



struct smb2_read_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 17 */

	__u8   DataOffset;

	__u8   Reserved;

	__le32 DataLength;

	__le32 DataRemaining;

	__u32  Flags;

	__u8   Buffer[1];

} __packed;



/* For write request Flags field below the following flags are defined: */

#define SMB2_WRITEFLAG_WRITE_THROUGH	0x00000001	/* SMB2.1 or later */

#define SMB2_WRITEFLAG_WRITE_UNBUFFERED	0x00000002	/* SMB3.02 or later */



struct smb2_write_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 49 */

	__le16 DataOffset; /* offset from start of SMB2 header to write data */

	__le32 Length;

	__le64 Offset;

	__u64  PersistentFileId; /* opaque endianness */

	__u64  VolatileFileId; /* opaque endianness */

	__le32 Channel; /* MBZ unless SMB3.02 or later */

	__le32 RemainingBytes;

	__le16 WriteChannelInfoOffset;

	__le16 WriteChannelInfoLength;

	__le32 Flags;

	__u8   Buffer[1];

} __packed;



struct smb2_write_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 17 */

	__u8   DataOffset;

	__u8   Reserved;

	__le32 DataLength;

	__le32 DataRemaining;

	__u32  Reserved2;

	__u8   Buffer[1];

} __packed;



/* notify flags */

#define SMB2_WATCH_TREE			0x0001



/* notify completion filter flags. See MS-FSCC 2.6 and MS-SMB2 2.2.35 */

#define FILE_NOTIFY_CHANGE_FILE_NAME		0x00000001

#define FILE_NOTIFY_CHANGE_DIR_NAME		0x00000002

#define FILE_NOTIFY_CHANGE_ATTRIBUTES		0x00000004

#define FILE_NOTIFY_CHANGE_SIZE			0x00000008

#define FILE_NOTIFY_CHANGE_LAST_WRITE		0x00000010

#define FILE_NOTIFY_CHANGE_LAST_ACCESS		0x00000020

#define FILE_NOTIFY_CHANGE_CREATION		0x00000040

#define FILE_NOTIFY_CHANGE_EA			0x00000080

#define FILE_NOTIFY_CHANGE_SECURITY		0x00000100

#define FILE_NOTIFY_CHANGE_STREAM_NAME		0x00000200

#define FILE_NOTIFY_CHANGE_STREAM_SIZE		0x00000400

#define FILE_NOTIFY_CHANGE_STREAM_WRITE		0x00000800



struct smb2_change_notify_req {

	struct smb2_hdr hdr;

	__le16	StructureSize;

	__le16	Flags;

	__le32	OutputBufferLength;

	__u64	PersistentFileId; /* opaque endianness */

	__u64	VolatileFileId; /* opaque endianness */

	__le32	CompletionFilter;

	__u32	Reserved;

} __packed;



struct smb2_change_notify_rsp {

	struct smb2_hdr hdr;

	__le16	StructureSize;  /* Must be 9 */

	__le16	OutputBufferOffset;

	__le32	OutputBufferLength;

	__u8	Buffer[1]; /* array of file notify structs */

} __packed;



#define SMB2_LOCKFLAG_SHARED_LOCK	0x0001

#define SMB2_LOCKFLAG_EXCLUSIVE_LOCK	0x0002

#define SMB2_LOCKFLAG_UNLOCK		0x0004

fs/smbfs_common/smb2pdu.h

+241 −0
Original line number Diff line number Diff line
@@ -544,4 +544,245 @@ struct smb2_negotiate_rsp { 
} __packed;





/*

 * SMB2_SESSION_SETUP  See MS-SMB2 section 2.2.5

 */

/* Flags */

#define SMB2_SESSION_REQ_FLAG_BINDING		0x01

#define SMB2_SESSION_REQ_FLAG_ENCRYPT_DATA	0x04



struct smb2_sess_setup_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 25 */

	__u8   Flags;

	__u8   SecurityMode;

	__le32 Capabilities;

	__le32 Channel;

	__le16 SecurityBufferOffset;

	__le16 SecurityBufferLength;

	__le64 PreviousSessionId;

	__u8   Buffer[1];	/* variable length GSS security buffer */

} __packed;



/* Currently defined SessionFlags */

#define SMB2_SESSION_FLAG_IS_GUEST        0x0001

#define SMB2_SESSION_FLAG_IS_GUEST_LE     cpu_to_le16(0x0001)

#define SMB2_SESSION_FLAG_IS_NULL         0x0002

#define SMB2_SESSION_FLAG_IS_NULL_LE      cpu_to_le16(0x0002)

#define SMB2_SESSION_FLAG_ENCRYPT_DATA    0x0004

#define SMB2_SESSION_FLAG_ENCRYPT_DATA_LE cpu_to_le16(0x0004)



struct smb2_sess_setup_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 9 */

	__le16 SessionFlags;

	__le16 SecurityBufferOffset;

	__le16 SecurityBufferLength;

	__u8   Buffer[1];	/* variable length GSS security buffer */

} __packed;





/*

 * SMB2_LOGOFF  See MS-SMB2 section 2.2.7

 */

struct smb2_logoff_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 4 */

	__le16 Reserved;

} __packed;



struct smb2_logoff_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 4 */

	__le16 Reserved;

} __packed;





/*

 * SMB2_CLOSE  See MS-SMB2 section 2.2.15

 */

/* Currently defined values for close flags */

#define SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB	cpu_to_le16(0x0001)

struct smb2_close_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 24 */

	__le16 Flags;

	__le32 Reserved;

	__le64  PersistentFileId; /* opaque endianness */

	__le64  VolatileFileId; /* opaque endianness */

} __packed;



/*

 * Maximum size of a SMB2_CLOSE response is 64 (smb2 header) + 60 (data)

 */

#define MAX_SMB2_CLOSE_RESPONSE_SIZE 124



struct smb2_close_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* 60 */

	__le16 Flags;

	__le32 Reserved;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 AllocationSize;	/* Beginning of FILE_STANDARD_INFO equivalent */

	__le64 EndOfFile;

	__le32 Attributes;

} __packed;





/*

 * SMB2_READ  See MS-SMB2 section 2.2.19

 */

/* For read request Flags field below, following flag is defined for SMB3.02 */

#define SMB2_READFLAG_READ_UNBUFFERED	0x01

#define SMB2_READFLAG_REQUEST_COMPRESSED 0x02 /* See MS-SMB2 2.2.19 */



/* Channel field for read and write: exactly one of following flags can be set*/

#define SMB2_CHANNEL_NONE               cpu_to_le32(0x00000000)

#define SMB2_CHANNEL_RDMA_V1            cpu_to_le32(0x00000001)

#define SMB2_CHANNEL_RDMA_V1_INVALIDATE cpu_to_le32(0x00000002)

#define SMB2_CHANNEL_RDMA_TRANSFORM     cpu_to_le32(0x00000003)



/* SMB2 read request without RFC1001 length at the beginning */

struct smb2_read_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 49 */

	__u8   Padding; /* offset from start of SMB2 header to place read */

	__u8   Flags; /* MBZ unless SMB3.02 or later */

	__le32 Length;

	__le64 Offset;

	__le64  PersistentFileId;

	__le64  VolatileFileId;

	__le32 MinimumCount;

	__le32 Channel; /* MBZ except for SMB3 or later */

	__le32 RemainingBytes;

	__le16 ReadChannelInfoOffset;

	__le16 ReadChannelInfoLength;

	__u8   Buffer[1];

} __packed;



/* Read flags */

#define SMB2_READFLAG_RESPONSE_NONE            cpu_to_le32(0x00000000)

#define SMB2_READFLAG_RESPONSE_RDMA_TRANSFORM  cpu_to_le32(0x00000001)



struct smb2_read_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 17 */

	__u8   DataOffset;

	__u8   Reserved;

	__le32 DataLength;

	__le32 DataRemaining;

	__le32 Flags;

	__u8   Buffer[1];

} __packed;





/*

 * SMB2_WRITE  See MS-SMB2 section 2.2.21

 */

/* For write request Flags field below the following flags are defined: */

#define SMB2_WRITEFLAG_WRITE_THROUGH	0x00000001	/* SMB2.1 or later */

#define SMB2_WRITEFLAG_WRITE_UNBUFFERED	0x00000002	/* SMB3.02 or later */



struct smb2_write_req {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 49 */

	__le16 DataOffset; /* offset from start of SMB2 header to write data */

	__le32 Length;

	__le64 Offset;

	__le64  PersistentFileId; /* opaque endianness */

	__le64  VolatileFileId; /* opaque endianness */

	__le32 Channel; /* MBZ unless SMB3.02 or later */

	__le32 RemainingBytes;

	__le16 WriteChannelInfoOffset;

	__le16 WriteChannelInfoLength;

	__le32 Flags;

	__u8   Buffer[1];

} __packed;



struct smb2_write_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize; /* Must be 17 */

	__u8   DataOffset;

	__u8   Reserved;

	__le32 DataLength;

	__le32 DataRemaining;

	__u32  Reserved2;

	__u8   Buffer[1];

} __packed;





/*

 * SMB2_FLUSH  See MS-SMB2 section 2.2.17

 */

struct smb2_flush_req {

	struct smb2_hdr hdr;

	__le16 StructureSize;	/* Must be 24 */

	__le16 Reserved1;

	__le32 Reserved2;

	__le64  PersistentFileId;

	__le64  VolatileFileId;

} __packed;



struct smb2_flush_rsp {

	struct smb2_hdr hdr;

	__le16 StructureSize;

	__le16 Reserved;

} __packed;





/*

 * SMB2_NOTIFY  See MS-SMB2 section 2.2.35

 */

/* notify flags */

#define SMB2_WATCH_TREE			0x0001



/* notify completion filter flags. See MS-FSCC 2.6 and MS-SMB2 2.2.35 */

#define FILE_NOTIFY_CHANGE_FILE_NAME		0x00000001

#define FILE_NOTIFY_CHANGE_DIR_NAME		0x00000002

#define FILE_NOTIFY_CHANGE_ATTRIBUTES		0x00000004

#define FILE_NOTIFY_CHANGE_SIZE			0x00000008

#define FILE_NOTIFY_CHANGE_LAST_WRITE		0x00000010

#define FILE_NOTIFY_CHANGE_LAST_ACCESS		0x00000020

#define FILE_NOTIFY_CHANGE_CREATION		0x00000040

#define FILE_NOTIFY_CHANGE_EA			0x00000080

#define FILE_NOTIFY_CHANGE_SECURITY		0x00000100

#define FILE_NOTIFY_CHANGE_STREAM_NAME		0x00000200

#define FILE_NOTIFY_CHANGE_STREAM_SIZE		0x00000400

#define FILE_NOTIFY_CHANGE_STREAM_WRITE		0x00000800



/* SMB2 Notify Action Flags */

#define FILE_ACTION_ADDED                       0x00000001

#define FILE_ACTION_REMOVED                     0x00000002

#define FILE_ACTION_MODIFIED                    0x00000003

#define FILE_ACTION_RENAMED_OLD_NAME            0x00000004

#define FILE_ACTION_RENAMED_NEW_NAME            0x00000005

#define FILE_ACTION_ADDED_STREAM                0x00000006

#define FILE_ACTION_REMOVED_STREAM              0x00000007

#define FILE_ACTION_MODIFIED_STREAM             0x00000008

#define FILE_ACTION_REMOVED_BY_DELETE           0x00000009



struct smb2_change_notify_req {

	struct smb2_hdr hdr;

	__le16	StructureSize;

	__le16	Flags;

	__le32	OutputBufferLength;

	__le64	PersistentFileId; /* opaque endianness */

	__le64	VolatileFileId; /* opaque endianness */

	__le32	CompletionFilter;

	__u32	Reserved;

} __packed;



struct smb2_change_notify_rsp {

	struct smb2_hdr hdr;

	__le16	StructureSize;  /* Must be 9 */

	__le16	OutputBufferOffset;

	__le32	OutputBufferLength;

	__u8	Buffer[1]; /* array of file notify structs */

} __packed;







#endif				/* _COMMON_SMB2PDU_H */