Commit 319e2398 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bdev/nvme: refactor "current" calculation for get_io_path RPC 



This preps for an upcoming patch.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: Idee6d739ba85595d632920a72146f11fa5a4d2fa
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22792


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent ca291ca2

module/bdev/nvme/bdev_nvme.c

+9 −2
Original line number Diff line number Diff line
@@ -8478,7 +8478,9 @@ nvme_io_path_info_json(struct spdk_json_write_ctx *w, struct nvme_io_path *io_pa 
	struct nvme_ctrlr *nvme_ctrlr = io_path->qpair->ctrlr;

	const struct spdk_nvme_ctrlr_data *cdata;

	const struct spdk_nvme_transport_id *trid;

	const struct nvme_bdev_channel *nbdev_ch;

	const char *adrfam_str;

	bool current;



	spdk_json_write_object_begin(w);
@@ -8488,8 +8490,13 @@ nvme_io_path_info_json(struct spdk_json_write_ctx *w, struct nvme_io_path *io_pa 
	trid = spdk_nvme_ctrlr_get_transport_id(nvme_ctrlr->ctrlr);



	spdk_json_write_named_uint32(w, "cntlid", cdata->cntlid);

	spdk_json_write_named_bool(w, "current", io_path->nbdev_ch != NULL &&

				   io_path == io_path->nbdev_ch->current_io_path);

	nbdev_ch = io_path->nbdev_ch;

	if (nbdev_ch == NULL) {

		current = false;

	} else {

		current = (io_path == nbdev_ch->current_io_path);

	}

	spdk_json_write_named_bool(w, "current", current);

	spdk_json_write_named_bool(w, "connected", nvme_qpair_is_connected(io_path->qpair));

	spdk_json_write_named_bool(w, "accessible", nvme_ns_is_accessible(nvme_ns));