diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index e02a204db..8251691cd 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -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) {
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index de7c20bbe..0cd687f1b 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -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)
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 88eb03573..1cf3af3f3 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -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;
 		}
diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c
index dbe04a1de..391d4bcf1 100644
--- a/lib/nvmf/tcp.c
+++ b/lib/nvmf/tcp.c
@@ -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;
 		}
diff --git a/test/unit/lib/nvmf/rdma.c/rdma_ut.c b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
index 43e63c3a5..b0af58d18 100644
--- a/test/unit/lib/nvmf/rdma.c/rdma_ut.c
+++ b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
@@ -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)