Commit ac15e16b authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/ocssd: Clean up verify_range() 



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: default avatarShuhei 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent d1519809

module/bdev/nvme/bdev_ocssd.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

module/bdev/nvme/common.c

+2 −0
Original line number Diff line number Diff line
@@ -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);