ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/nvmf: Remove req_to_abort parameter from nvmf_ctrlr_abort_request()

Browse Source 
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: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I9ef2467d6f92422f044650c62a0777b95c0fc1ab
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3488
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Michael Haeuptle <michaelhaeuptle@gmail.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Shuhei Matsumoto 2020-07-23 07:29:21 +09:00 committed by Jim Harris
parent 45a2d80429
commit 81437ff6ce
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvmf/ctrlr.c
View File

@ -2163,14 +2163,16 @@ nvmf_ctrlr_abort(struct spdk_nvmf_request *req)
} }
int int
nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req, nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req)
struct spdk_nvmf_request *req_to_abort)
{ {
struct spdk_nvmf_request *req_to_abort = req->req_to_abort;
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
struct spdk_bdev_desc *desc; struct spdk_bdev_desc *desc;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
int rc; int rc;
assert(req_to_abort != NULL);
rc = spdk_nvmf_request_get_bdev(req_to_abort->cmd->nvme_cmd.nsid, req_to_abort, rc = spdk_nvmf_request_get_bdev(req_to_abort->cmd->nvme_cmd.nsid, req_to_abort,
&bdev, &desc, &ch); &bdev, &desc, &ch);
if (rc != 0) { if (rc != 0) {

3
lib/nvmf/nvmf_internal.h
View File

@ -352,8 +352,7 @@ void nvmf_ctrlr_abort_aer(struct spdk_nvmf_ctrlr *ctrlr);
*/ */
void nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair); void nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair);
int nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req, int nvmf_ctrlr_abort_request(struct spdk_nvmf_request *req);
struct spdk_nvmf_request *req_to_abort);
static inline struct spdk_nvmf_ns * static inline struct spdk_nvmf_ns *
_nvmf_subsystem_get_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid) _nvmf_subsystem_get_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid)

2
lib/nvmf/rdma.c
View File

@ -4057,7 +4057,7 @@ _nvmf_rdma_qpair_abort_request(void *ctx)
switch (rdma_req_to_abort->state) { switch (rdma_req_to_abort->state) {
case RDMA_REQUEST_STATE_EXECUTING: 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) { if (rc == SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS) {
return SPDK_POLLER_BUSY; return SPDK_POLLER_BUSY;
} }

2
lib/nvmf/tcp.c
View File

@ -2496,7 +2496,7 @@ _nvmf_tcp_qpair_abort_request(void *ctx)
switch (tcp_req_to_abort->state) { switch (tcp_req_to_abort->state) {
case TCP_REQUEST_STATE_EXECUTING: 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) { if (rc == SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS) {
return SPDK_POLLER_BUSY; return SPDK_POLLER_BUSY;
} }

4
test/unit/lib/nvmf/rdma.c/rdma_ut.c
View File

@ -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, DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid,
enum spdk_nvme_transport_type trtype)); 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_V(spdk_nvmf_tgt_new_qpair, (struct spdk_nvmf_tgt *tgt, struct spdk_nvmf_qpair *qpair));
DEFINE_STUB(nvmf_ctrlr_abort_request, int, DEFINE_STUB(nvmf_ctrlr_abort_request, int, (struct spdk_nvmf_request *req), 0);
(struct spdk_nvmf_request *req, struct spdk_nvmf_request *req_to_abort),
0);
const char * const char *
spdk_nvme_transport_id_trtype_str(enum spdk_nvme_transport_type trtype) spdk_nvme_transport_id_trtype_str(enum spdk_nvme_transport_type trtype)