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

bdev/nvme: Check if a controller with the same TRID exists first in bdev_nvme_create() 



This simpifies the code a little without any degradation.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I6006266e250f2d083aa12424809d04fac6a9f8f0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4385


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 7b9b1eef

module/bdev/nvme/bdev_nvme.c

+8 −4
Original line number Diff line number Diff line
@@ -1914,6 +1914,14 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, 
	struct nvme_bdev_ctrlr		*existing_ctrlr;

	int				rc;



	/* TODO expand this check to include both the host and target TRIDs.

	 * Only if both are the same should we fail.

	 */

	if (nvme_bdev_ctrlr_get(trid) != NULL) {

		SPDK_ERRLOG("A controller with the provided trid (traddr: %s) already exists.\n", trid->traddr);

		return -EEXIST;

	}



	existing_ctrlr = nvme_bdev_ctrlr_get_by_name(base_name);

	if (existing_ctrlr) {

		if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {
@@ -1925,10 +1933,6 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, 
		if (rc) {

			return rc;

		}

		/* TODO expand this check to include both the host and target TRIDs. Only if both are the same should we fail. */

	} else if (nvme_bdev_ctrlr_get(trid) != NULL) {

		SPDK_ERRLOG("A controller with the provided trid (traddr: %s) already exists.\n", trid->traddr);

		return -EEXIST;

	}



	if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {