From 11ea8da9aa78533d212ac1d8802b251c6b54c78c Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Mon, 29 Nov 2021 16:05:10 +0100 Subject: [PATCH] nvmf: rename spdk_nvmf_using_zcopy to spdk_nvmf_request_using_zcopy It's more descriptive that way, as it's clear the function works on a single request. Also, passing a request instead of zcopy_phase makes it more convient to use. Signed-off-by: Konrad Sztyber Change-Id: If4d7b087511e128f3590ac7b3b5adcb8ace12003 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10781 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker Reviewed-by: Dong Yi Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins --- include/spdk/nvmf_transport.h | 12 ++++++------ lib/nvmf/ctrlr.c | 4 ++-- lib/nvmf/ctrlr_bdev.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h index 2ff83f998..5ef71dc6d 100644 --- a/include/spdk/nvmf_transport.h +++ b/include/spdk/nvmf_transport.h @@ -89,12 +89,6 @@ enum spdk_nvmf_zcopy_phase { NVMF_ZCOPY_PHASE_INIT_FAILED /* Failed to get the buffers */ }; -static inline bool -spdk_nvmf_using_zcopy(enum spdk_nvmf_zcopy_phase phase) -{ - return (phase != NVMF_ZCOPY_PHASE_NONE); -} - struct spdk_nvmf_request { struct spdk_nvmf_qpair *qpair; uint32_t length; @@ -457,6 +451,12 @@ int spdk_nvmf_request_complete(struct spdk_nvmf_request *req); int spdk_nvmf_request_zcopy_start(struct spdk_nvmf_request *req); int spdk_nvmf_request_zcopy_end(struct spdk_nvmf_request *req, bool commit); +static inline bool +spdk_nvmf_request_using_zcopy(const struct spdk_nvmf_request *req) +{ + return req->zcopy_phase != NVMF_ZCOPY_PHASE_NONE; +} + /** * Remove the given qpair from the poll group. * diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 5e251fbfd..b01d5614f 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -801,7 +801,7 @@ nvmf_subsystem_pg_from_connect_cmd(struct spdk_nvmf_request *req) static void nvmf_add_to_outstanding_queue(struct spdk_nvmf_request *req) { - if (!spdk_nvmf_using_zcopy(req->zcopy_phase)) { + if (!spdk_nvmf_request_using_zcopy(req)) { /* if using zcopy then request has been added when the start zcopy was actioned */ struct spdk_nvmf_qpair *qpair = req->qpair; TAILQ_INSERT_TAIL(&qpair->outstanding, req, link); @@ -4170,7 +4170,7 @@ spdk_nvmf_request_exec(struct spdk_nvmf_request *req) struct spdk_nvmf_transport *transport = qpair->transport; enum spdk_nvmf_request_exec_status status; - if (!spdk_nvmf_using_zcopy(req->zcopy_phase)) { + if (!spdk_nvmf_request_using_zcopy(req)) { if (!nvmf_check_subsystem_active(req)) { return; } diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c index 5d1fac958..4c2feac83 100644 --- a/lib/nvmf/ctrlr_bdev.c +++ b/lib/nvmf/ctrlr_bdev.c @@ -311,7 +311,7 @@ nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; } - assert(!spdk_nvmf_using_zcopy(req->zcopy_phase)); + assert(!spdk_nvmf_request_using_zcopy(req)); rc = spdk_bdev_readv_blocks(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks, nvmf_bdev_ctrlr_complete_cmd, req); @@ -362,7 +362,7 @@ nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; } - assert(!spdk_nvmf_using_zcopy(req->zcopy_phase)); + assert(!spdk_nvmf_request_using_zcopy(req)); rc = spdk_bdev_writev_blocks(desc, ch, req->iov, req->iovcnt, start_lba, num_blocks, nvmf_bdev_ctrlr_complete_cmd, req);