d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/ocssd: Clean up verify_range()

Browse Source 
We can pass nvme_bdev_ns directly to bdev_ocssd_verify_range() and
actually we don't need to check if bdevs are created on the same
namespace.

For the former, change parameters of bdev_ocssd_verify_range() from
nvme_bdev_ctrlr and nsid to nvme_bdev_ns. For the latter, remove the
check but add assert to nvme_bdev_attach_bdev_to_ns() instead.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I23c3a0ad02fa2b9f4c8149d9b02660140b2d3951
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5554
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-12-10 20:59:37 +09:00 committed by Tomasz Zawadzki
parent d15198098f
commit ac15e16b8b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/bdev/nvme/bdev_ocssd.c
View File

@ -1229,10 +1229,9 @@ bdev_ocssd_init_zones(struct bdev_ocssd_create_ctx *create_ctx)
}
static bool
bdev_ocssd_verify_range(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, uint32_t nsid,
bdev_ocssd_verify_range(struct nvme_bdev_ns *nvme_ns,
const struct bdev_ocssd_range *range)
{
struct nvme_bdev_ns *nvme_ns = nvme_bdev_ctrlr->namespaces[nsid - 1];
struct bdev_ocssd_ns *ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_ns);
const struct spdk_ocssd_geometry_data *geometry = &ocssd_ns->geometry;
struct ocssd_bdev *ocssd_bdev;
@ -1247,11 +1246,6 @@ bdev_ocssd_verify_range(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, uint32_t nsid,
TAILQ_FOREACH(nvme_bdev, &nvme_ns->bdevs, tailq) {
ocssd_bdev = SPDK_CONTAINEROF(nvme_bdev, struct ocssd_bdev, nvme_bdev);
/* Only verify bdevs created on the same namespace */
if (spdk_nvme_ns_get_id(nvme_bdev->nvme_ns->ns) != nsid) {
continue;
}
/* Empty range means whole namespace should be used */
if (range == NULL) {
return false;
@ -1323,7 +1317,7 @@ bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint32_t n
goto error;
}
if (!bdev_ocssd_verify_range(nvme_bdev_ctrlr, nsid, range)) {
if (!bdev_ocssd_verify_range(nvme_ns, range)) {
SPDK_ERRLOG("Invalid parallel unit range\n");
rc = -EINVAL;
goto error;

2
module/bdev/nvme/common.c
View File

@ -181,6 +181,8 @@ nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
void
nvme_bdev_attach_bdev_to_ns(struct nvme_bdev_ns *nvme_ns, struct nvme_bdev *nvme_disk)
{
assert(nvme_disk->nvme_ns == nvme_ns);
nvme_ns->ctrlr->ref++;
TAILQ_INSERT_TAIL(&nvme_ns->bdevs, nvme_disk, tailq);