Commit f220d590 authored by Konrad Sztyber's avatar Konrad Sztyber
Browse files

nvmf: rename passthrough_nsid -> passthru_nsid 



This is the spelling we typically use.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I40ad23301fd5be6d02b50abb4209ae1c7aeacc96
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25396


Community-CI: Mellanox Build Bot
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
parent 1a158640

lib/nvmf/ctrlr.c

+8 −8
Original line number Diff line number Diff line
@@ -2893,9 +2893,9 @@ spdk_nvmf_ctrlr_identify_ns_ext(struct spdk_nvmf_request *req) 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	assert(ns->passthrough_nsid != 0);

	assert(ns->passthru_nsid != 0);

	req->orig_nsid = ns->nsid;

	cmd->nsid = ns->passthrough_nsid;

	cmd->nsid = ns->passthru_nsid;



	return spdk_nvmf_bdev_ctrlr_nvme_passthru_admin(bdev, desc, ch, req, identify_ns_passthru_cb);

}
@@ -4554,8 +4554,8 @@ nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
	}



	if (ctrlr->subsys->passthrough) {

		assert(ns->passthrough_nsid > 0);

		req->cmd->nvme_cmd.nsid = ns->passthrough_nsid;

		assert(ns->passthru_nsid > 0);

		req->cmd->nvme_cmd.nsid = ns->passthru_nsid;



		return nvmf_bdev_ctrlr_nvme_passthru_io(bdev, desc, ch, req);

	}
@@ -4604,8 +4604,8 @@ nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
			if (spdk_unlikely(qpair->transport->opts.disable_command_passthru)) {

				goto invalid_opcode;

			}

			if (ns->passthrough_nsid) {

				req->cmd->nvme_cmd.nsid = ns->passthrough_nsid;

			if (ns->passthru_nsid) {

				req->cmd->nvme_cmd.nsid = ns->passthru_nsid;

			}

			return nvmf_bdev_ctrlr_nvme_passthru_io(bdev, desc, ch, req);

		}
@@ -5011,8 +5011,8 @@ nvmf_passthru_admin_cmd_for_bdev_nsid(struct spdk_nvmf_request *req, uint32_t bd 
	ctrlr = req->qpair->ctrlr;

	ns = nvmf_ctrlr_get_ns(ctrlr, bdev_nsid);



	if (ns->passthrough_nsid) {

		req->cmd->nvme_cmd.nsid = ns->passthrough_nsid;

	if (ns->passthru_nsid) {

		req->cmd->nvme_cmd.nsid = ns->passthru_nsid;

	}



	return spdk_nvmf_bdev_ctrlr_nvme_passthru_admin(bdev, desc, ch, req, NULL);

lib/nvmf/nvmf_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct spdk_nvmf_ns { 
	/* Namespace is always visible to all controllers */

	bool always_visible;

	/* Namespace id of the underlying device, used for passthrough commands */

	uint32_t passthrough_nsid;

	uint32_t passthru_nsid;

};



/*

lib/nvmf/subsystem.c

+2 −2
Original line number Diff line number Diff line
@@ -2179,8 +2179,8 @@ spdk_nvmf_subsystem_add_ns_ext(struct spdk_nvmf_subsystem *subsystem, const char 
		return 0;

	}



	ns->passthrough_nsid = spdk_bdev_get_nvme_nsid(ns->bdev);

	if (subsystem->passthrough && ns->passthrough_nsid == 0) {

	ns->passthru_nsid = spdk_bdev_get_nvme_nsid(ns->bdev);

	if (subsystem->passthrough && ns->passthru_nsid == 0) {

		SPDK_ERRLOG("Only bdev_nvme namespaces can be added to a passthrough subsystem.\n");

		goto err;

	}