Commit 3e1569e8 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

nvme_ctrlr: combine spdk_nvme_ctrlr_reset functions 



We no longer need the private function with a public wrapper.

Change-Id: I0d24dfb282461174729d3eb649c78ac27e42fc8d
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471552


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
parent 0a42e658

lib/nvme/nvme_ctrlr.c

+4 −12
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ error: 
}



int

nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)

spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)

{

	int rc = 0;

	struct spdk_nvme_qpair	*qpair;
@@ -1032,23 +1032,15 @@ nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 


out:

	ctrlr->is_resetting = false;

	if (rc) {

		nvme_ctrlr_fail(ctrlr, false);

	}



	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);



	return rc;

}



int

spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)

{

	if (nvme_ctrlr_reset(ctrlr) != 0) {

		nvme_ctrlr_fail(ctrlr, false);

		return -1;

	}



	return 0;

}



static void

nvme_ctrlr_identify_done(void *arg, const struct spdk_nvme_cpl *cpl)

{