xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: remove rfc1002 header from smb2_flush_req

Browse Source 
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
This commit is contained in:
Ronnie Sahlberg
2017-11-20 11:24:39 +11:00
committed by Steve French
parent 4f33bc3587
commit 1f444e4c06
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/cifs/smb2pdu.c
View File

@@ -2433,13 +2433,14 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
int resp_buftype; int resp_buftype;
int rc = 0; int rc = 0;
int flags = 0; int flags = 0;
unsigned int total_len;
cifs_dbg(FYI, "Flush\n"); cifs_dbg(FYI, "Flush\n");
if (!ses || !(ses->server)) if (!ses || !(ses->server))
return -EIO; return -EIO;
rc = small_smb2_init(SMB2_FLUSH, tcon, (void **) &req); rc = smb2_plain_req_init(SMB2_FLUSH, tcon, (void **) &req, &total_len);
if (rc) if (rc)
return rc; return rc;
@@ -2450,10 +2451,9 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
req->VolatileFileId = volatile_fid; req->VolatileFileId = volatile_fid;
iov[0].iov_base = (char *)req; iov[0].iov_base = (char *)req;
/* 4 for rfc1002 length field */ iov[0].iov_len = total_len;
iov[0].iov_len = get_rfc1002_length(req) + 4;
rc = SendReceive2(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov); rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);
cifs_small_buf_release(req); cifs_small_buf_release(req);
if (rc != 0) if (rc != 0)

2
fs/cifs/smb2pdu.h
View File

@@ -812,7 +812,7 @@ struct smb2_close_rsp {
} __packed; } __packed;
struct smb2_flush_req { struct smb2_flush_req {
struct smb2_hdr hdr; struct smb2_sync_hdr sync_hdr;
__le16 StructureSize; /* Must be 24 */ __le16 StructureSize; /* Must be 24 */
__le16 Reserved1; __le16 Reserved1;
__le32 Reserved2; __le32 Reserved2;