Commit 4aac975b authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

nvme: make nvme_qpair_enable just set the is_enabled flag 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I6782f311156dba87875a754fc64525f5ad7d06ea

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453748


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 04080101

lib/nvme/nvme_ctrlr.c

+1 −0
Original line number Diff line number Diff line
@@ -1923,6 +1923,7 @@ nvme_ctrlr_enable_admin_queue(struct spdk_nvme_ctrlr *ctrlr) 
{

	nvme_transport_qpair_reset(ctrlr->adminq);

	nvme_qpair_enable(ctrlr->adminq);

	nvme_transport_qpair_abort_reqs(ctrlr->adminq, 0 /* retry */);

}



/**

lib/nvme/nvme_qpair.c

+2 −5
Original line number Diff line number Diff line
@@ -405,7 +405,9 @@ static bool 
nvme_qpair_check_enabled(struct spdk_nvme_qpair *qpair)

{

	if (!qpair->is_enabled && !qpair->ctrlr->is_resetting) {

		nvme_qpair_abort_queued_reqs(qpair, 0 /* retry */);

		nvme_qpair_enable(qpair);

		nvme_transport_qpair_abort_reqs(qpair, 0 /* retry */);

	}



	return qpair->is_enabled;
@@ -592,12 +594,7 @@ nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *re 
void

nvme_qpair_enable(struct spdk_nvme_qpair *qpair)

{

	if (nvme_qpair_is_io_queue(qpair)) {

		nvme_qpair_abort_queued_reqs(qpair, 0);

	}



	qpair->is_enabled = true;

	nvme_transport_qpair_abort_reqs(qpair, 0 /* retry */);

}



void

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+5 −0
Original line number Diff line number Diff line
@@ -185,6 +185,11 @@ nvme_transport_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair) 
{

}



void

nvme_transport_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr)

{

}



int

nvme_driver_init(void)

{