From b4778363b436422892aa7c23e8527a47f455cb92 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 23 Aug 2019 08:56:11 +0900 Subject: [PATCH] nvmf/tcp: Pass nvmf_request to nvmf_tcp_req_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_tcp_req to nvmf_tcp_req_fill_buffers and do it in this patch. Signed-off-by: Shuhei Matsumoto Change-Id: I00eff578a98891e99fcb9a3aafa3d99126d6f1c1 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466089 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Broadcom SPDK FC-NVMe CI --- lib/nvmf/tcp.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 6ec39538c..6b0eeb658 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -2186,25 +2186,25 @@ spdk_nvmf_tcp_req_get_xfer(struct spdk_nvmf_tcp_req *tcp_req) { } static void -spdk_nvmf_tcp_req_fill_buffers(struct spdk_nvmf_tcp_req *tcp_req, +spdk_nvmf_tcp_req_fill_buffers(struct spdk_nvmf_request *req, struct spdk_nvmf_transport *transport, uint32_t length) { uint32_t i = 0; - tcp_req->req.iovcnt = 0; + req->iovcnt = 0; while (length) { - i = tcp_req->req.iovcnt; - tcp_req->req.iov[i].iov_base = (void *)((uintptr_t)(tcp_req->req.buffers[i] + - NVMF_DATA_BUFFER_MASK) & - ~NVMF_DATA_BUFFER_MASK); - tcp_req->req.iov[i].iov_len = spdk_min(length, transport->opts.io_unit_size); - tcp_req->req.iovcnt++; - length -= tcp_req->req.iov[i].iov_len; + i = req->iovcnt; + req->iov[i].iov_base = (void *)((uintptr_t)(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; } - assert(tcp_req->req.iovcnt <= SPDK_NVMF_MAX_SGL_ENTRIES); - tcp_req->req.data_from_pool = true; + assert(req->iovcnt <= SPDK_NVMF_MAX_SGL_ENTRIES); + req->data_from_pool = true; } static int @@ -2225,7 +2225,7 @@ spdk_nvmf_tcp_req_fill_iovs(struct spdk_nvmf_tcp_transport *ttransport, return -ENOMEM; } - spdk_nvmf_tcp_req_fill_buffers(tcp_req, &ttransport->transport, length); + spdk_nvmf_tcp_req_fill_buffers(&tcp_req->req, &ttransport->transport, length); return 0; }