From 90a2be2006ca80a96d62128385a9f9c9b74d98f3 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 23 Aug 2019 08:24:12 +0900 Subject: [PATCH] nvmf/fc: Pass nvmf_request to nvmf_fc_request_fill_buffers 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 Change-Id: Ibe87e7641e5c364b20a6d877ce7928c612b0b83a Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466088 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Anil Veerabhadrappa Reviewed-by: Broadcom SPDK FC-NVMe CI --- lib/nvmf/fc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c index 669074643..b6b5dfe90 100644 --- a/lib/nvmf/fc.c +++ b/lib/nvmf/fc.c @@ -1275,23 +1275,23 @@ complete: } 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) { uint32_t i; - fc_req->req.iovcnt = 0; + req->iovcnt = 0; while (length) { - i = fc_req->req.iovcnt; - fc_req->req.iov[i].iov_base = (void *)((uintptr_t)((char *)fc_req->req.buffers[i] + - NVMF_DATA_BUFFER_MASK) & - ~NVMF_DATA_BUFFER_MASK); - fc_req->req.iov[i].iov_len = spdk_min(length, transport->opts.io_unit_size); - fc_req->req.iovcnt++; - length -= fc_req->req.iov[i].iov_len; + i = req->iovcnt; + req->iov[i].iov_base = (void *)((uintptr_t)((char *)req->buffers[i] + + NVMF_DATA_BUFFER_MASK) & + ~NVMF_DATA_BUFFER_MASK); + req->iov[i].iov_len = spdk_min(length, transport->opts.io_unit_size); + req->iovcnt++; + length -= req->iov[i].iov_len; } - fc_req->req.data_from_pool = true; + req->data_from_pool = true; } static int @@ -1309,7 +1309,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req) return -ENOMEM; } - nvmf_fc_request_fill_buffers(fc_req, transport, length); + nvmf_fc_request_fill_buffers(&fc_req->req, transport, length); return 0; }