| Message ID | 20171107085514.12693-2-longli@exchange.microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2017-11-07 0:54 GMT-08:00 Long Li <longli@exchange.microsoft.com>: > From: Long Li <longli@microsoft.com> > > This patch is for preparing upper layer for doing SMB read via RDMA write. > > 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 <longli@microsoft.com> > --- > 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 bab3da6..32ad590 100644 > --- a/fs/cifs/smb2pdu.c > +++ b/fs/cifs/smb2pdu.c > @@ -2350,18 +2350,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; > @@ -2489,7 +2492,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 */ > @@ -2557,7 +2561,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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Looks good. Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> -- Best regards, Pavel Shilovsky -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index bab3da6..32ad590 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2350,18 +2350,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; @@ -2489,7 +2492,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 */ @@ -2557,7 +2561,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;