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

nvme: Inline nvme_ctrlr_[construct|destruct]_namespaces

Browse Source 
These are no longer complex enough to warrant being separate functions.

Change-Id: I5f3c9fc904b768b6509283c4b7def686bab9a1d2
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10032
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Ben Walker 2021-10-26 15:55:12 -07:00 committed by Tomasz Zawadzki
parent e7602c158f
commit dbde5edd39
1 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/nvme/nvme_ctrlr.c
View File

@ -43,7 +43,6 @@
struct nvme_active_ns_ctx; struct nvme_active_ns_ctx;
static void nvme_ctrlr_destruct_namespaces(struct spdk_nvme_ctrlr *ctrlr);
static int nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr, static int nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr,
struct nvme_async_event_request *aer); struct nvme_async_event_request *aer);
static void nvme_ctrlr_identify_active_ns_async(struct nvme_active_ns_ctx *ctx); static void nvme_ctrlr_identify_active_ns_async(struct nvme_active_ns_ctx *ctx);
@ -2412,13 +2411,11 @@ out:
} }
} }
static int nvme_ctrlr_construct_namespaces(struct spdk_nvme_ctrlr *ctrlr);
static void static void
_nvme_active_ns_ctx_deleter(struct nvme_active_ns_ctx *ctx) _nvme_active_ns_ctx_deleter(struct nvme_active_ns_ctx *ctx)
{ {
int rc;
struct spdk_nvme_ctrlr *ctrlr = ctx->ctrlr; struct spdk_nvme_ctrlr *ctrlr = ctx->ctrlr;
struct spdk_nvme_ns *ns;
if (ctx->state == NVME_ACTIVE_NS_STATE_ERROR) { if (ctx->state == NVME_ACTIVE_NS_STATE_ERROR) {
nvme_active_ns_ctx_destroy(ctx); nvme_active_ns_ctx_destroy(ctx);
@ -2428,12 +2425,10 @@ _nvme_active_ns_ctx_deleter(struct nvme_active_ns_ctx *ctx)
assert(ctx->state == NVME_ACTIVE_NS_STATE_DONE); assert(ctx->state == NVME_ACTIVE_NS_STATE_DONE);
rc = nvme_ctrlr_construct_namespaces(ctrlr); ctrlr->num_ns = ctrlr->cdata.nn;
if (rc) {
NVME_CTRLR_ERRLOG(ctrlr, "Unable to construct namespace array!\n"); RB_FOREACH(ns, nvme_ns_tree, &ctrlr->ns) {
nvme_active_ns_ctx_destroy(ctx); nvme_ns_free_iocs_specific_data(ns);
nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_ERROR, NVME_TIMEOUT_INFINITE);
return;
} }
nvme_ctrlr_identify_active_ns_swap(ctrlr, &ctx->new_ns_list, ctx->page_count * 1024); nvme_ctrlr_identify_active_ns_swap(ctrlr, &ctx->new_ns_list, ctx->page_count * 1024);
@ -3004,20 +2999,6 @@ nvme_ctrlr_set_host_id(struct spdk_nvme_ctrlr *ctrlr)
return 0; return 0;
} }
static void
nvme_ctrlr_destruct_namespaces(struct spdk_nvme_ctrlr *ctrlr)
{
struct spdk_nvme_ns *ns, *tmp_ns;
RB_FOREACH_SAFE(ns, nvme_ns_tree, &ctrlr->ns, tmp_ns) {
nvme_ctrlr_destruct_namespace(ctrlr, ns->id);
RB_REMOVE(nvme_ns_tree, &ctrlr->ns, ns);
spdk_free(ns);
}
ctrlr->num_ns = 0;
}
void void
nvme_ctrlr_update_namespaces(struct spdk_nvme_ctrlr *ctrlr) nvme_ctrlr_update_namespaces(struct spdk_nvme_ctrlr *ctrlr)
{ {
@ -3031,20 +3012,6 @@ nvme_ctrlr_update_namespaces(struct spdk_nvme_ctrlr *ctrlr)
} }
} }
static int
nvme_ctrlr_construct_namespaces(struct spdk_nvme_ctrlr *ctrlr)
{
struct spdk_nvme_ns *ns;
ctrlr->num_ns = ctrlr->cdata.nn;
RB_FOREACH(ns, nvme_ns_tree, &ctrlr->ns) {
nvme_ns_free_iocs_specific_data(ns);
}
return 0;
}
static int static int
nvme_ctrlr_clear_changed_ns_log(struct spdk_nvme_ctrlr *ctrlr) nvme_ctrlr_clear_changed_ns_log(struct spdk_nvme_ctrlr *ctrlr)
{ {
@ -4192,6 +4159,7 @@ int
nvme_ctrlr_destruct_poll_async(struct spdk_nvme_ctrlr *ctrlr, nvme_ctrlr_destruct_poll_async(struct spdk_nvme_ctrlr *ctrlr,
struct nvme_ctrlr_detach_ctx *ctx) struct nvme_ctrlr_detach_ctx *ctx)
{ {
struct spdk_nvme_ns *ns, *tmp_ns;
int rc = 0; int rc = 0;
if (!ctx->shutdown_complete) { if (!ctx->shutdown_complete) {
@ -4206,7 +4174,13 @@ nvme_ctrlr_destruct_poll_async(struct spdk_nvme_ctrlr *ctrlr,
ctx->cb_fn(ctrlr); ctx->cb_fn(ctrlr);
} }
nvme_ctrlr_destruct_namespaces(ctrlr); RB_FOREACH_SAFE(ns, nvme_ns_tree, &ctrlr->ns, tmp_ns) {
nvme_ctrlr_destruct_namespace(ctrlr, ns->id);
RB_REMOVE(nvme_ns_tree, &ctrlr->ns, ns);
spdk_free(ns);
}
ctrlr->num_ns = 0;
spdk_free(ctrlr->active_ns_list); spdk_free(ctrlr->active_ns_list);
ctrlr->active_ns_list = NULL; ctrlr->active_ns_list = NULL;
ctrlr->active_ns_count = 0; ctrlr->active_ns_count = 0;