Commit 81437ff6 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

lib/nvmf: Remove req_to_abort parameter from nvmf_ctrlr_abort_request() 



struct spdk_nvmf_request holds req_to_abort and so passing req_to_abort
separately is not really necessary now. The internal API
nvmf_ctrlr_abort_request() was added at the stage of prototyping.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I9ef2467d6f92422f044650c62a0777b95c0fc1ab
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3488


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 45a2d804

lib/nvmf/ctrlr.c

+4 −2
Original line number Diff line number Diff line
@@ -2163,14 +2163,16 @@ nvmf_ctrlr_abort(struct spdk_nvmf_request *req) 
}



int

nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req,

			 struct spdk_nvmf_request *req_to_abort)

nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_request *req_to_abort = req->req_to_abort;

	struct spdk_bdev *bdev;

	struct spdk_bdev_desc *desc;

	struct spdk_io_channel *ch;

	int rc;



	assert(req_to_abort != NULL);



	rc = spdk_nvmf_request_get_bdev(req_to_abort->cmd->nvme_cmd.nsid, req_to_abort,

					&bdev, &desc, &ch);

	if (rc != 0) {

lib/nvmf/nvmf_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ void nvmf_ctrlr_abort_aer(struct spdk_nvmf_ctrlr *ctrlr); 
 */

void nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair);



int nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req,

			     struct spdk_nvmf_request *req_to_abort);

int nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req);



static inline struct spdk_nvmf_ns *

_nvmf_subsystem_get_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid)

lib/nvmf/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -4057,7 +4057,7 @@ _nvmf_rdma_qpair_abort_request(void *ctx) 


	switch (rdma_req_to_abort->state) {

	case RDMA_REQUEST_STATE_EXECUTING:

		rc = nvmf_ctrlr_abort_request(req, &rdma_req_to_abort->req);

		rc = nvmf_ctrlr_abort_request(req);

		if (rc == SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS) {

			return SPDK_POLLER_BUSY;

		}

lib/nvmf/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2496,7 +2496,7 @@ _nvmf_tcp_qpair_abort_request(void *ctx) 


	switch (tcp_req_to_abort->state) {

	case TCP_REQUEST_STATE_EXECUTING:

		rc = nvmf_ctrlr_abort_request(req, &tcp_req_to_abort->req);

		rc = nvmf_ctrlr_abort_request(req);

		if (rc == SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS) {

			return SPDK_POLLER_BUSY;

		}

test/unit/lib/nvmf/rdma.c/rdma_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -86,9 +86,7 @@ DEFINE_STUB(spdk_nvmf_request_get_dif_ctx, bool, (struct spdk_nvmf_request *req, 
DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid,

		enum spdk_nvme_transport_type trtype));

DEFINE_STUB_V(spdk_nvmf_tgt_new_qpair, (struct spdk_nvmf_tgt *tgt, struct spdk_nvmf_qpair *qpair));

DEFINE_STUB(nvmf_ctrlr_abort_request, int,

	    (struct spdk_nvmf_request *req, struct spdk_nvmf_request *req_to_abort),

	    0);

DEFINE_STUB(nvmf_ctrlr_abort_request, int, (struct spdk_nvmf_request *req), 0);



const char *

spdk_nvme_transport_id_trtype_str(enum spdk_nvme_transport_type trtype)