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

bdev/nvme: Factor out nvme_ns active/inactive check into a helper function 



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


Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 1c656889

module/bdev/nvme/bdev_nvme.c

+13 −3
Original line number Diff line number Diff line
@@ -827,12 +827,22 @@ bdev_nvme_io_type_is_admin(enum spdk_bdev_io_type io_type) 
}



static inline bool

nvme_ns_is_accessible(struct nvme_ns *nvme_ns)

nvme_ns_is_active(struct nvme_ns *nvme_ns)

{

	if (spdk_unlikely(nvme_ns->ana_state_updating)) {

		return false;

	}



	return true;

}



static inline bool

nvme_ns_is_accessible(struct nvme_ns *nvme_ns)

{

	if (spdk_unlikely(!nvme_ns_is_active(nvme_ns))) {

		return false;

	}



	switch (nvme_ns->ana_state) {

	case SPDK_NVME_ANA_OPTIMIZED_STATE:

	case SPDK_NVME_ANA_NON_OPTIMIZED_STATE:
@@ -959,7 +969,7 @@ _bdev_nvme_find_io_path(struct nvme_bdev_channel *nbdev_ch) 
	io_path = start;

	do {

		if (spdk_likely(nvme_qpair_is_connected(io_path->qpair) &&

				!io_path->nvme_ns->ana_state_updating)) {

				nvme_ns_is_active(io_path->nvme_ns))) {

			switch (io_path->nvme_ns->ana_state) {

			case SPDK_NVME_ANA_OPTIMIZED_STATE:

				nbdev_ch->current_io_path = io_path;
@@ -1000,7 +1010,7 @@ _bdev_nvme_find_io_path_min_qd(struct nvme_bdev_channel *nbdev_ch) 
			continue;

		}



		if (spdk_unlikely(io_path->nvme_ns->ana_state_updating)) {

		if (spdk_unlikely(!nvme_ns_is_active(io_path->nvme_ns))) {

			continue;

		}