Commit 4fa4e4cc authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Use bdev_nvme_find_io_path() to a remaining case, no_pi_readv() 



bdev_nvme_no_pi_readv() had not been used for bdev_nvme_no_pi_readv() yet.

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


Community-CI: Broadcom CI
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>
parent 2b2a297d

module/bdev/nvme/bdev_nvme.c

+15 −11
Original line number Diff line number Diff line
@@ -2288,6 +2288,8 @@ bdev_nvme_readv_done(void *ref, const struct spdk_nvme_cpl *cpl) 
	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx(bio);

	struct nvme_bdev *nbdev = (struct nvme_bdev *)bdev_io->bdev->ctxt;

	struct nvme_io_channel *nvme_ch;

	struct nvme_bdev_ns *nvme_ns;

	struct spdk_nvme_qpair *qpair;

	int ret;



	if (spdk_unlikely(spdk_nvme_cpl_is_pi_error(cpl))) {
@@ -2299,9 +2301,10 @@ bdev_nvme_readv_done(void *ref, const struct spdk_nvme_cpl *cpl) 


		nvme_ch = spdk_io_channel_get_ctx(spdk_bdev_io_get_io_channel(bdev_io));



		if (spdk_likely(bdev_nvme_find_io_path(nbdev, nvme_ch, &nvme_ns, &qpair))) {

			/* Read without PI checking to verify PI error. */

		ret = bdev_nvme_no_pi_readv(nbdev->nvme_ns->ns,

					    nvme_ch->qpair,

			ret = bdev_nvme_no_pi_readv(nvme_ns->ns,

						    qpair,

						    bio,

						    bdev_io->u.bdev.iovs,

						    bdev_io->u.bdev.iovcnt,
@@ -2312,6 +2315,7 @@ bdev_nvme_readv_done(void *ref, const struct spdk_nvme_cpl *cpl) 
				return;

			}

		}

	}



	spdk_bdev_io_complete_nvme_status(bdev_io, cpl->cdw0, cpl->status.sct, cpl->status.sc);

}