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

nvme_ctrlr: combine spdk_nvme_ctrlr_reset functions

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

Change-Id: I0d24dfb282461174729d3eb649c78ac27e42fc8d
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471552
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Seth Howell 2019-10-16 08:35:10 -07:00 committed by Jim Harris
parent 0a42e658b5
commit 3e1569e875
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nvme/nvme_ctrlr.c
View File

@ -955,7 +955,7 @@ error:
} }
int int
nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
{ {
int rc = 0; int rc = 0;
struct spdk_nvme_qpair *qpair; struct spdk_nvme_qpair *qpair;
@ -1032,23 +1032,15 @@ nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
out: out:
ctrlr->is_resetting = false; ctrlr->is_resetting = false;
if (rc) {
nvme_ctrlr_fail(ctrlr, false);
}
nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
return rc; 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 static void
nvme_ctrlr_identify_done(void *arg, const struct spdk_nvme_cpl *cpl) nvme_ctrlr_identify_done(void *arg, const struct spdk_nvme_cpl *cpl)
{ {