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

bdev/nvme: Factor out check if path should be deleted into a helper function 



This improves the readability and makes us easier to add more changes.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I55d7925d70f2a204f65a81f3fc44cf96b69c3ebe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16709


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 07ca24ec

module/bdev/nvme/bdev_nvme.c

+56 −48
Original line number Diff line number Diff line
@@ -5305,72 +5305,82 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, 
	return 0;

}



int

bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)

static bool

nvme_path_should_delete(struct nvme_path_id *p, const struct nvme_path_id *path_id)

{

	struct nvme_bdev_ctrlr	*nbdev_ctrlr;

	struct nvme_ctrlr	*nvme_ctrlr, *tmp_nvme_ctrlr;

	struct nvme_path_id	*p, *t;

	int			rc = -ENXIO;



	if (name == NULL || path_id == NULL) {

		return -EINVAL;

	}



	nbdev_ctrlr = nvme_bdev_ctrlr_get_by_name(name);

	if (nbdev_ctrlr == NULL) {

		SPDK_ERRLOG("Failed to find NVMe bdev controller\n");

		return -ENODEV;

	}



	TAILQ_FOREACH_SAFE(nvme_ctrlr, &nbdev_ctrlr->ctrlrs, tailq, tmp_nvme_ctrlr) {

		TAILQ_FOREACH_REVERSE_SAFE(p, &nvme_ctrlr->trids, nvme_paths, link, t) {

	if (path_id->trid.trtype != 0) {

		if (path_id->trid.trtype == SPDK_NVME_TRANSPORT_CUSTOM) {

			if (strcasecmp(path_id->trid.trstring, p->trid.trstring) != 0) {

						continue;

				return false;

			}

		} else {

			if (path_id->trid.trtype != p->trid.trtype) {

						continue;

				return false;

			}

		}

	}



	if (!spdk_mem_all_zero(path_id->trid.traddr, sizeof(path_id->trid.traddr))) {

		if (strcasecmp(path_id->trid.traddr, p->trid.traddr) != 0) {

					continue;

			return false;

		}

	}



	if (path_id->trid.adrfam != 0) {

		if (path_id->trid.adrfam != p->trid.adrfam) {

					continue;

			return false;

		}

	}



	if (!spdk_mem_all_zero(path_id->trid.trsvcid, sizeof(path_id->trid.trsvcid))) {

		if (strcasecmp(path_id->trid.trsvcid, p->trid.trsvcid) != 0) {

					continue;

			return false;

		}

	}



	if (!spdk_mem_all_zero(path_id->trid.subnqn, sizeof(path_id->trid.subnqn))) {

		if (strcmp(path_id->trid.subnqn, p->trid.subnqn) != 0) {

					continue;

			return false;

		}

	}



	if (!spdk_mem_all_zero(path_id->hostid.hostaddr, sizeof(path_id->hostid.hostaddr))) {

		if (strcmp(path_id->hostid.hostaddr, p->hostid.hostaddr) != 0) {

					continue;

			return false;

		}

	}



	if (!spdk_mem_all_zero(path_id->hostid.hostsvcid, sizeof(path_id->hostid.hostsvcid))) {

		if (strcmp(path_id->hostid.hostsvcid, p->hostid.hostsvcid) != 0) {

					continue;

			return false;

		}

	}



	return true;

}



int

bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)

{

	struct nvme_bdev_ctrlr	*nbdev_ctrlr;

	struct nvme_ctrlr	*nvme_ctrlr, *tmp_nvme_ctrlr;

	struct nvme_path_id	*p, *t;

	int			rc = -ENXIO;



	if (name == NULL || path_id == NULL) {

		return -EINVAL;

	}



	nbdev_ctrlr = nvme_bdev_ctrlr_get_by_name(name);

	if (nbdev_ctrlr == NULL) {

		SPDK_ERRLOG("Failed to find NVMe bdev controller\n");

		return -ENODEV;

	}



	TAILQ_FOREACH_SAFE(nvme_ctrlr, &nbdev_ctrlr->ctrlrs, tailq, tmp_nvme_ctrlr) {

		TAILQ_FOREACH_REVERSE_SAFE(p, &nvme_ctrlr->trids, nvme_paths, link, t) {

			if (!nvme_path_should_delete(p, path_id)) {

				continue;

			}



			/* If we made it here, then this path is a match! Now we need to remove it. */
@@ -5394,8 +5404,6 @@ bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id) 
			if (rc < 0 && rc != -ENXIO) {

				return rc;

			}





		}

	}