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

bdev/nvme: Move attach_bdev_to_ns() into bdev_create()

Browse Source 
Move nvme_bdev_attach_bdev_to_ns() into nvme_bdev_create() and
change the return type of nvme_bdev_create() to int.

These refactorings are necessary to share a single nvme_bdev among
multiple nvme_bdev_ns.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I81c702bfec15f14c6b4a6588d1d3dfa28a9e3e6d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5650
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-12-21 11:19:46 +09:00 committed by Tomasz Zawadzki
parent 01541c31fb
commit b2d785ee48
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
module/bdev/nvme/bdev_nvme.c
View File

@ -1160,7 +1160,7 @@ nvme_disk_create(struct spdk_bdev *disk, const char *base_name,
return 0; return 0;
} }
static struct nvme_bdev * static int
nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *nvme_ns) nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev *bdev; struct nvme_bdev *bdev;
@ -1169,7 +1169,7 @@ nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *n
bdev = calloc(1, sizeof(*bdev)); bdev = calloc(1, sizeof(*bdev));
if (!bdev) { if (!bdev) {
SPDK_ERRLOG("bdev calloc() failed\n"); SPDK_ERRLOG("bdev calloc() failed\n");
return NULL; return -ENOMEM;
} }
bdev->nvme_ns = nvme_ns; bdev->nvme_ns = nvme_ns;
@ -1179,17 +1179,17 @@ nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *n
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Failed to create NVMe disk\n"); SPDK_ERRLOG("Failed to create NVMe disk\n");
free(bdev); free(bdev);
return NULL; return rc;
} }
return bdev; nvme_bdev_attach_bdev_to_ns(nvme_ns, bdev);
return 0;
} }
static void static void
nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx) struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx)
{ {
struct nvme_bdev *bdev;
struct spdk_nvme_ctrlr *ctrlr = nvme_bdev_ctrlr->ctrlr; struct spdk_nvme_ctrlr *ctrlr = nvme_bdev_ctrlr->ctrlr;
struct spdk_nvme_ns *ns; struct spdk_nvme_ns *ns;
int rc = 0; int rc = 0;
@ -1203,14 +1203,7 @@ nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
nvme_ns->ns = ns; nvme_ns->ns = ns;
bdev = nvme_bdev_create(nvme_bdev_ctrlr, nvme_ns); rc = nvme_bdev_create(nvme_bdev_ctrlr, nvme_ns);
if (!bdev) {
rc = -ENOMEM;
goto done;
}
nvme_bdev_attach_bdev_to_ns(nvme_ns, bdev);
done: done:
nvme_ctrlr_populate_namespace_done(ctx, nvme_ns, rc); nvme_ctrlr_populate_namespace_done(ctx, nvme_ns, rc);
} }