{"id":833229,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833229/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-2-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-2-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:02:54","name":"[01/19] cifs: Add SendReceive3","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2da26b5191165ae1e4ef9b1c9af0d2d8b730e81e","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-2-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/833229/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833229/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3ySGLP5z2Hz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 18:05:01 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755209AbdKBHFB (ORCPT );\n\tThu, 2 Nov 2017 03:05:01 -0400","from mx1.redhat.com ([209.132.183.28]:57950 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754513AbdKBHE7 (ORCPT );\n\tThu, 2 Nov 2017 03:04:59 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 0AF905F739;\n\tThu, 2 Nov 2017 07:04:59 +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 C024A5D9C6;\n\tThu, 2 Nov 2017 07:04:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0AF905F739","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 01/19] cifs: Add SendReceive3","Date":"Thu, 2 Nov 2017 18:02:54 +1100","Message-Id":"<20171102070312.18903-2-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tThu, 02 Nov 2017 07:04:59 +0000 (UTC)","Sender":"linux-cifs-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-cifs@vger.kernel.org"},"content":"This function is similar to SendReceive2 except it does not expect\na 4 byte rfc1002 length header in the first io vector.\n\nSigned-off-by: Ronnie Sahlberg \n---\n fs/cifs/cifsproto.h | 4 ++++\n fs/cifs/transport.c | 38 ++++++++++++++++++++++++++++++++++++++\n 2 files changed, 42 insertions(+)","diff":"diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h\nindex 4143c9dec463..a4e3c6c5aa64 100644\n--- a/fs/cifs/cifsproto.h\n+++ b/fs/cifs/cifsproto.h\n@@ -106,6 +106,10 @@ extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *,\n \t\t\tstruct kvec *, int /* nvec to send */,\n \t\t\tint * /* type of buf returned */, const int flags,\n \t\t\tstruct kvec * /* resp vec */);\n+extern int SendReceive3(const unsigned int /* xid */ , struct cifs_ses *,\n+\t\t\tstruct kvec *, int /* nvec to send */,\n+\t\t\tint * /* type of buf returned */, const int flags,\n+\t\t\tstruct kvec * /* resp vec */);\n extern int SendReceiveBlockingLock(const unsigned int xid,\n \t\t\tstruct cifs_tcon *ptcon,\n \t\t\tstruct smb_hdr *in_buf ,\ndiff --git a/fs/cifs/transport.c b/fs/cifs/transport.c\nindex 7efbab013957..3f16adec3df5 100644\n--- a/fs/cifs/transport.c\n+++ b/fs/cifs/transport.c\n@@ -827,6 +827,44 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,\n \treturn rc;\n }\n \n+/* Like SendReceive2 but iov[0] does not contain an rfc1002 header */\n+int\n+SendReceive3(const unsigned int xid, struct cifs_ses *ses,\n+\t struct kvec *iov, int n_vec, int *resp_buf_type /* ret */,\n+\t const int flags, struct kvec *resp_iov)\n+{\n+\tstruct smb_rqst rqst;\n+\tstruct kvec *new_iov;\n+\tint rc;\n+\tint i;\n+\t__u32 count;\n+\t__be32 rfc1002_marker;\n+\n+\tnew_iov = kmalloc(sizeof(struct kvec) * (n_vec + 1), GFP_KERNEL);\n+\tif (!new_iov)\n+\t\treturn -ENOMEM;\n+\n+\t/* 1st iov is an RFC1002 Session Message length */\n+\tmemcpy(new_iov + 1, iov, (sizeof(struct kvec) * n_vec));\n+\n+\tcount = 0;\n+\tfor (i = 1; i < n_vec + 1; i++)\n+\t\tcount += new_iov[i].iov_len;\n+\n+\trfc1002_marker = cpu_to_be32(count);\n+\n+\tnew_iov[0].iov_base = &rfc1002_marker;\n+\tnew_iov[0].iov_len = 4;\n+\n+\tmemset(&rqst, 0, sizeof(struct smb_rqst));\n+\trqst.rq_iov = new_iov;\n+\trqst.rq_nvec = n_vec + 1;\n+\n+\trc = cifs_send_recv(xid, ses, &rqst, resp_buf_type, flags, resp_iov);\n+\tkfree(new_iov);\n+\treturn rc;\n+}\n+\n int\n SendReceive(const unsigned int xid, struct cifs_ses *ses,\n \t struct smb_hdr *in_buf, struct smb_hdr *out_buf,\n","prefixes":["01/19"]}