cifs: Update patch based on Pavels feedback
Subsystems (2)
There was a bug in the computation of total_len that Pavel reported. This is the updated patch.
A message that is not in the archive (sent off-list or not yet received): 20171120230727.10236-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
PATCH 12/19 cifs: remove rfc1002 header from smb2_lock_req
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2pdu.c | 13 ++++++------- fs/cifs/smb2pdu.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-)
fs/cifs/smb2pdu.c +6 -7
@@ -3521,34 +3521,33 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,int resp_buf_type;unsigned int count;int flags =CIFS_NO_RESP ; +unsigned int total_len;cifs_dbg (FYI ,"smb2_lockv num lock %d\n" , num_lock); - rc =small_smb2_init (SMB2_LOCK , tcon, (void **) &req); + rc =smb2_plain_req_init (SMB2_LOCK , tcon, (void **) &req, &total_len);if (rc)return rc;if (encryption_required (tcon)) flags |=CIFS_TRANSFORM_REQ ; - req->hdr.sync_hdr.ProcessId =cpu_to_le32 (pid); + req->sync_hdr.ProcessId =cpu_to_le32 (pid); req->LockCount =cpu_to_le16 (num_lock); req->PersistentFileId = persist_fid; req->VolatileFileId = volatile_fid; count = num_lock *sizeof (struct smb2_lock_element ); -inc_rfc1001_len (req, count -sizeof (struct smb2_lock_element )); iov[0 ].iov_base = (char *)req; -/* 4 for rfc1002 length field and count for all locks */ - iov[0 ].iov_len =get_rfc1002_length (req) +4 - count; + iov[0 ].iov_len = total_len -sizeof (struct smb2_lock_element ); iov[1 ].iov_base = (char *)buf; iov[1 ].iov_len = count;cifs_stats_inc (&tcon->stats.cifs_stats.num_locks); - rc =SendReceive2 (xid, tcon->ses, iov,2 , &resp_buf_type, flags, - &rsp_iov); + rc =smb2_send_recv (xid, tcon->ses, iov,2 , &resp_buf_type, flags, + &rsp_iov);cifs_small_buf_release (req);if (rc) {cifs_dbg (FYI ,"Send error in smb2_lockv = %d\n" , rc);
fs/cifs/smb2pdu.h +1 -1
@@ -907,7 +907,7 @@ struct smb2_lock_element { } __packed;struct smb2_lock_req { -struct smb2_hdr hdr; +struct smb2_sync_hdr sync_hdr;__le16 StructureSize;/* Must be 48 */ __le16 LockCount;__le32 Reserved;
Signature · 1 line
2.13.3