Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753857AbdHTTII (ORCPT ); Sun, 20 Aug 2017 15:08:08 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:53674 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753678AbdHTTGw (ORCPT ); Sun, 20 Aug 2017 15:06:52 -0400 x-originating-ip: 107.180.71.197 From: Long Li To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Christoph Hellwig , Tom Talpey , Matthew Wilcox Cc: Long Li Subject: [Patch v2 15/19] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Date: Sun, 20 Aug 2017 12:04:39 -0700 Message-Id: <1503255883-3041-16-git-send-email-longli@exchange.microsoft.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1503255883-3041-1-git-send-email-longli@exchange.microsoft.com> References: <1503255883-3041-1-git-send-email-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfFU3xyECx3aqwDLbOFx/TIwQ0p2n0DT+BxcmTA2oBhvq64vtRKCy2B33IPFBhxbls3zRSqwfeitpMfrvXI6ljJVIVN54r2O4/DR6GmzayDoD9LZnWgoM /eIIOQXDpCxHpNbhU8fKpd1nYloU2nRZbA/I3Mfix3dMufMnsSp+WA0XWr6FE4Kv+ekSKL5cfQhOJOZA7OFdE3Sq2VbMJngEEwf+kksc/tLTLJk0xiUcfY56 OtgGbUYlCiW9ZhU6ZIN3ucsYpcPLkSofFU6CGS9jdlJXQniHWJqSjKaGCi+nVGXb42td1BrBtjjV7jC9VH1dAmiePMLSA0sw6sOvNTYi/ceEujtBCgIRXYVC DEI7Sh01mWTSaJdHULFMxalWufknOgfqeoJuUPA57Tk4YQaB6wRKhOuq3LD5YcklQW4dMPFg53XTX9IdlOnnNUPeXy73ukIOPfkHwiURpq1iECmP1lt0dBYO SXZu10eWit54v7XU Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1989 Lines: 59 From: Long Li When we assemble the SMB READ packet header, we need to know the I/O layout if this request is to use a RDMA write. rdata has all the information we need for memory registration. Add rdata to smb2_new_read_req. Signed-off-by: Long Li --- fs/cifs/smb2pdu.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 5551053..fbad987 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2363,18 +2363,21 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, */ static int smb2_new_read_req(void **buf, unsigned int *total_len, - struct cifs_io_parms *io_parms, unsigned int remaining_bytes, - int request_type) + struct cifs_io_parms *io_parms, struct cifs_readdata *rdata, + unsigned int remaining_bytes, int request_type) { int rc = -EACCES; struct smb2_read_plain_req *req = NULL; struct smb2_sync_hdr *shdr; + struct TCP_Server_Info *server; rc = smb2_plain_req_init(SMB2_READ, io_parms->tcon, (void **) &req, total_len); if (rc) return rc; - if (io_parms->tcon->ses->server == NULL) + + server = io_parms->tcon->ses->server; + if (server == NULL) return -ECONNABORTED; shdr = &req->sync_hdr; @@ -2502,7 +2505,8 @@ smb2_async_readv(struct cifs_readdata *rdata) server = io_parms.tcon->ses->server; - rc = smb2_new_read_req((void **) &buf, &total_len, &io_parms, 0, 0); + rc = smb2_new_read_req( + (void **) &buf, &total_len, &io_parms, rdata, 0, 0); if (rc) { if (rc == -EAGAIN && rdata->credits) { /* credits was reset by reconnect */ @@ -2570,7 +2574,7 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms, struct cifs_ses *ses = io_parms->tcon->ses; *nbytes = 0; - rc = smb2_new_read_req((void **)&req, &total_len, io_parms, 0, 0); + rc = smb2_new_read_req((void **)&req, &total_len, io_parms, NULL, 0, 0); if (rc) return rc; -- 2.7.4