From d8d1a4dd380f298f29af98ab1105d5f034f952c1 Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Thu, 20 Oct 2022 18:14:54 +0200 Subject: [PATCH] bdev/passthru: Use ext bdev API Fixes commit c3a5848 where support of memory domains was added without usage of the ext API Signed-off-by: Alexey Marchuk Change-Id: Ia0d7132f11c233e334965669ab0d237c24074745 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15088 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Paul Luse --- module/bdev/passthru/vbdev_passthru.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module/bdev/passthru/vbdev_passthru.c b/module/bdev/passthru/vbdev_passthru.c index 88236e464..52a16f2ea 100644 --- a/module/bdev/passthru/vbdev_passthru.c +++ b/module/bdev/passthru/vbdev_passthru.c @@ -232,11 +232,11 @@ pt_read_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, boo return; } - if (bdev_io->u.bdev.md_buf == NULL) { - rc = spdk_bdev_readv_blocks(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, - bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, - bdev_io->u.bdev.num_blocks, _pt_complete_io, - bdev_io); + if (bdev_io->u.bdev.ext_opts) { + rc = spdk_bdev_readv_blocks_ext(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, + bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, + bdev_io->u.bdev.num_blocks, _pt_complete_io, + bdev_io, bdev_io->u.bdev.ext_opts); } else { rc = spdk_bdev_readv_blocks_with_md(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, @@ -282,11 +282,11 @@ vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *b bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); break; case SPDK_BDEV_IO_TYPE_WRITE: - if (bdev_io->u.bdev.md_buf == NULL) { - rc = spdk_bdev_writev_blocks(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, - bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, - bdev_io->u.bdev.num_blocks, _pt_complete_io, - bdev_io); + if (bdev_io->u.bdev.ext_opts) { + rc = spdk_bdev_writev_blocks_ext(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, + bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, + bdev_io->u.bdev.num_blocks, _pt_complete_io, + bdev_io, bdev_io->u.bdev.ext_opts); } else { rc = spdk_bdev_writev_blocks_with_md(pt_node->base_desc, pt_ch->base_ch, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,