{"id":833227,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833227/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-13-lsahlber@redhat.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.2/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171102070312.18903-13-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:03:05","name":"[12/19] cifs: remove rfc1002 header from smb2_lock_req","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3ffd5deec78bc87288b9810723f346fc7591c456","submitter":{"id":72324,"url":"http://patchwork.ozlabs.org/api/1.2/people/72324/?format=json","name":"Ronnie Sahlberg","email":"lsahlber@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-13-lsahlber@redhat.com/mbox/","series":[{"id":11445,"url":"http://patchwork.ozlabs.org/api/1.2/series/11445/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=11445","date":"2017-11-02T07:03:12","name":"cifs: remove rfc1002 header from all smb2 requests","version":1,"mbox":"http://patchwork.ozlabs.org/series/11445/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833227/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833227/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-cifs-owner@vger.kernel.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=lsahlber@redhat.com"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySGLD2zsLz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 18:04:52 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755212AbdKBHEv (ORCPT );\n\tThu, 2 Nov 2017 03:04:51 -0400","from mx1.redhat.com ([209.132.183.28]:52538 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755084AbdKBHEv (ORCPT );\n\tThu, 2 Nov 2017 03:04:51 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C9C13356CE;\n\tThu, 2 Nov 2017 07:04:50 +0000 (UTC)","from test1190.test.redhat.com (vpn2-54-17.bne.redhat.com\n\t[10.64.54.17])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CFFCD5D6AE;\n\tThu, 2 Nov 2017 07:04:49 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C9C13356CE","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 12/19] cifs: remove rfc1002 header from smb2_lock_req","Date":"Thu, 2 Nov 2017 18:03:05 +1100","Message-Id":"<20171102070312.18903-13-lsahlber@redhat.com>","In-Reply-To":"<20171102070312.18903-1-lsahlber@redhat.com>","References":"<20171102070312.18903-1-lsahlber@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 02 Nov 2017 07:04:50 +0000 (UTC)","Sender":"linux-cifs-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-cifs@vger.kernel.org"},"content":"Signed-off-by: Ronnie Sahlberg \n---\n fs/cifs/smb2pdu.c | 11 +++++------\n fs/cifs/smb2pdu.h | 2 +-\n 2 files changed, 6 insertions(+), 7 deletions(-)","diff":"diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex b49e0028cf4f..5dc0ec2cad1e 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -3513,33 +3513,32 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,\n \tint resp_buf_type;\n \tunsigned int count;\n \tint flags = CIFS_NO_RESP;\n+\tunsigned int total_len;\n \n \tcifs_dbg(FYI, \"smb2_lockv num lock %d\\n\", num_lock);\n \n-\trc = small_smb2_init(SMB2_LOCK, tcon, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_LOCK, tcon, (void **) &req, &total_len);\n \tif (rc)\n \t\treturn rc;\n \n \tif (encryption_required(tcon))\n \t\tflags |= CIFS_TRANSFORM_REQ;\n \n-\treq->hdr.sync_hdr.ProcessId = cpu_to_le32(pid);\n+\treq->sync_hdr.ProcessId = cpu_to_le32(pid);\n \treq->LockCount = cpu_to_le16(num_lock);\n \n \treq->PersistentFileId = persist_fid;\n \treq->VolatileFileId = volatile_fid;\n \n \tcount = num_lock * sizeof(struct smb2_lock_element);\n-\tinc_rfc1001_len(req, count - sizeof(struct smb2_lock_element));\n \n \tiov[0].iov_base = (char *)req;\n-\t/* 4 for rfc1002 length field and count for all locks */\n-\tiov[0].iov_len = get_rfc1002_length(req) + 4 - count;\n+\tiov[0].iov_len = total_len;\n \tiov[1].iov_base = (char *)buf;\n \tiov[1].iov_len = count;\n \n \tcifs_stats_inc(&tcon->stats.cifs_stats.num_locks);\n-\trc = SendReceive2(xid, tcon->ses, iov, 2, &resp_buf_type, flags,\n+\trc = SendReceive3(xid, tcon->ses, iov, 2, &resp_buf_type, flags,\n \t\t\t &rsp_iov);\n \tcifs_small_buf_release(req);\n \tif (rc) {\ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex a8102e5f4ebb..0c33fc8cce71 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -907,7 +907,7 @@ struct smb2_lock_element {\n } __packed;\n \n struct smb2_lock_req {\n-\tstruct smb2_hdr hdr;\n+\tstruct smb2_sync_hdr sync_hdr;\n \t__le16 StructureSize; /* Must be 48 */\n \t__le16 LockCount;\n \t__le32 Reserved;\n","prefixes":["12/19"]}