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

nvme: Add nvme_ctrlr_construct_namespace

Browse Source 
This constructs a new namespace object.

Change-Id: I2b13c7491a221f047553433df451b6236422b7c8
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10025
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: Eugene Kochetov <ekochetov@yandex.ru>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Dong Yi <dongx.yi@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2021-10-18 13:45:34 -07:00 committed by Tomasz Zawadzki
parent f555a8af97
commit 937086379f
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/nvme/nvme_ctrlr.c
View File

@ -2155,6 +2155,20 @@ nvme_ctrlr_destruct_namespace(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)
return 0; return 0;
} }
static int
nvme_ctrlr_construct_namespace(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)
{
struct spdk_nvme_ns *ns;
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
if (ns == NULL) {
return -EINVAL;
}
return nvme_ns_construct(ns, nsid, ctrlr);
}
static void static void
nvme_ctrlr_identify_active_ns_swap(struct spdk_nvme_ctrlr *ctrlr, uint32_t **new_ns_list, nvme_ctrlr_identify_active_ns_swap(struct spdk_nvme_ctrlr *ctrlr, uint32_t **new_ns_list,
size_t max_entries) size_t max_entries)
@ -2900,7 +2914,7 @@ nvme_ctrlr_update_namespaces(struct spdk_nvme_ctrlr *ctrlr)
if ((nsdata->ncap == 0) && ns_is_active) { if ((nsdata->ncap == 0) && ns_is_active) {
NVME_CTRLR_DEBUGLOG(ctrlr, "Namespace %u was added\n", nsid); NVME_CTRLR_DEBUGLOG(ctrlr, "Namespace %u was added\n", nsid);
if (nvme_ns_construct(ns, nsid, ctrlr) != 0) { if (nvme_ctrlr_construct_namespace(ctrlr, nsid) != 0) {
continue; continue;
} }
} }
@ -4469,7 +4483,6 @@ spdk_nvme_ctrlr_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
{ {
struct nvme_completion_poll_status *status; struct nvme_completion_poll_status *status;
int res; int res;
struct spdk_nvme_ns *ns;
if (nsid == 0) { if (nsid == 0) {
return -EINVAL; return -EINVAL;
@ -4501,9 +4514,7 @@ spdk_nvme_ctrlr_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
return res; return res;
} }
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid); return nvme_ctrlr_construct_namespace(ctrlr, nsid);
assert(ns != NULL);
return nvme_ns_construct(ns, nsid, ctrlr);
} }
int int
@ -4552,7 +4563,6 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
struct nvme_completion_poll_status *status; struct nvme_completion_poll_status *status;
int res; int res;
uint32_t nsid; uint32_t nsid;
struct spdk_nvme_ns *ns;
status = calloc(1, sizeof(*status)); status = calloc(1, sizeof(*status));
if (!status) { if (!status) {
@ -4578,10 +4588,7 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
assert(nsid > 0); assert(nsid > 0);
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid); res = nvme_ctrlr_construct_namespace(ctrlr, nsid);
assert(ns != NULL);
/* Inactive NS */
res = nvme_ns_construct(ns, nsid, ctrlr);
if (res) { if (res) {
return 0; return 0;
} }