ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf/fc: Pass nvmf_request to nvmf_fc_request_fill_buffers

Browse Source 
Most variables related with I/O buffer are in struct spdk_nvmf_request
now. So we can pass nvmf_request instead of nvmf_fc_request to
nvmf_fc_request_fill_buffers and do it in this patch.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ibe87e7641e5c364b20a6d877ce7928c612b0b83a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466088
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Shuhei Matsumoto 2019-08-23 08:24:12 +09:00 committed by Jim Harris
parent 9412a8370d
commit 90a2be2006
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/nvmf/fc.c
View File

@ -1275,23 +1275,23 @@ complete:
} }
static void static void
nvmf_fc_request_fill_buffers(struct spdk_nvmf_fc_request *fc_req, nvmf_fc_request_fill_buffers(struct spdk_nvmf_request *req,
struct spdk_nvmf_transport *transport, uint32_t length) struct spdk_nvmf_transport *transport, uint32_t length)
{ {
uint32_t i; uint32_t i;
fc_req->req.iovcnt = 0; req->iovcnt = 0;
while (length) { while (length) {
i = fc_req->req.iovcnt; i = req->iovcnt;
fc_req->req.iov[i].iov_base = (void *)((uintptr_t)((char *)fc_req->req.buffers[i] + req->iov[i].iov_base = (void *)((uintptr_t)((char *)req->buffers[i] +
NVMF_DATA_BUFFER_MASK) & NVMF_DATA_BUFFER_MASK) &
~NVMF_DATA_BUFFER_MASK); ~NVMF_DATA_BUFFER_MASK);
fc_req->req.iov[i].iov_len = spdk_min(length, transport->opts.io_unit_size); req->iov[i].iov_len = spdk_min(length, transport->opts.io_unit_size);
fc_req->req.iovcnt++; req->iovcnt++;
length -= fc_req->req.iov[i].iov_len; length -= req->iov[i].iov_len;
} }
fc_req->req.data_from_pool = true; req->data_from_pool = true;
} }
static int static int
@ -1309,7 +1309,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req)
return -ENOMEM; return -ENOMEM;
} }
nvmf_fc_request_fill_buffers(fc_req, transport, length); nvmf_fc_request_fill_buffers(&fc_req->req, transport, length);
return 0; return 0;
} }