d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvme: rename nvme_qpair_abort_reqs to *_with_cbarg

Browse Source 
Renamed nvme_qpair_abort_reqs() to nvme_qpair_abort_reqs_with_cbarg() to
highlight the fact that it only aborts requests with specified cb_arg
and to distinguish it from _nvme_qpair_abort_reqs() which aborts all
requests immediately.

Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I32fec5ab0501b1beb8605689d73ec42a6424fba5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9323
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Konrad Sztyber 2021-08-27 08:53:03 +02:00 committed by Tomasz Zawadzki
parent 75aa60e123
commit 1fbeeb23b3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvme/nvme_ctrlr_cmd.c
View File

@ -789,7 +789,7 @@ spdk_nvme_ctrlr_cmd_abort_ext(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp
* Hence abort queued requests which has cmd_cb_arg as its callback
* context next.
*/
aborted = nvme_qpair_abort_queued_reqs(qpair, cmd_cb_arg);
aborted = nvme_qpair_abort_queued_reqs_with_cbarg(qpair, cmd_cb_arg);
if (parent->num_children == 0) {
/* There was no outstanding request to abort. */
if (aborted > 0) {

2
lib/nvme/nvme_internal.h
View File

@ -1180,7 +1180,7 @@ void nvme_qpair_complete_error_reqs(struct spdk_nvme_qpair *qpair);
int nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair,
struct nvme_request *req);
void nvme_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);
uint32_t nvme_qpair_abort_queued_reqs(struct spdk_nvme_qpair *qpair, void *cmd_cb_arg);
uint32_t nvme_qpair_abort_queued_reqs_with_cbarg(struct spdk_nvme_qpair *qpair, void *cmd_cb_arg);
void nvme_qpair_resubmit_requests(struct spdk_nvme_qpair *qpair, uint32_t num_requests);
int nvme_ctrlr_identify_active_ns(struct spdk_nvme_ctrlr *ctrlr);
void nvme_ns_set_identify_data(struct spdk_nvme_ns *ns);

2
lib/nvme/nvme_qpair.c
View File

@ -590,7 +590,7 @@ _nvme_qpair_complete_abort_queued_reqs(struct spdk_nvme_qpair *qpair)
}
uint32_t
nvme_qpair_abort_queued_reqs(struct spdk_nvme_qpair *qpair, void *cmd_cb_arg)
nvme_qpair_abort_queued_reqs_with_cbarg(struct spdk_nvme_qpair *qpair, void *cmd_cb_arg)
{
struct nvme_request *req, *tmp;
uint32_t aborting = 0;

2
test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
View File

@ -76,7 +76,7 @@ DEFINE_STUB(nvme_transport_qpair_iterate_requests, int,
int (*iter_fn)(struct nvme_request *req, void *arg),
void *arg), 0);
DEFINE_STUB(nvme_qpair_abort_queued_reqs, uint32_t,
DEFINE_STUB(nvme_qpair_abort_queued_reqs_with_cbarg, uint32_t,
(struct spdk_nvme_qpair *qpair, void *cmd_cb_arg), 0);
static void verify_firmware_log_page(struct nvme_request *req)