From 6fa5007edd5c8ca79a955b53d7107973294e6055 Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Thu, 20 Oct 2022 18:41:59 +0200 Subject: [PATCH] bdev/zone: Call bdev*_with_md even if md is NULL The bdev*_with_md APIs now allow to pass NULL md pointer, so calling this function without checking for metadata simplifies code Signed-off-by: Alexey Marchuk Change-Id: Ie4137f7a6a7628a13d14c7c9a5e9aa1ceb99d322 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15091 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Paul Luse --- module/bdev/zone_block/vbdev_zone_block.c | 35 +++++++---------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/module/bdev/zone_block/vbdev_zone_block.c b/module/bdev/zone_block/vbdev_zone_block.c index 826b7e216..467f1da68 100644 --- a/module/bdev/zone_block/vbdev_zone_block.c +++ b/module/bdev/zone_block/vbdev_zone_block.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) Intel Corporation. + * Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. * All rights reserved. */ @@ -416,18 +417,11 @@ zone_block_write(struct bdev_zone_block *bdev_node, struct zone_block_io_channel } pthread_spin_unlock(&zone->lock); - if (bdev_io->u.bdev.md_buf == NULL) { - rc = spdk_bdev_writev_blocks(bdev_node->base_desc, ch->base_ch, bdev_io->u.bdev.iovs, - bdev_io->u.bdev.iovcnt, lba, - bdev_io->u.bdev.num_blocks, _zone_block_complete_write, - bdev_io); - } else { - rc = spdk_bdev_writev_blocks_with_md(bdev_node->base_desc, ch->base_ch, - bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, - bdev_io->u.bdev.md_buf, - lba, bdev_io->u.bdev.num_blocks, - _zone_block_complete_write, bdev_io); - } + rc = spdk_bdev_writev_blocks_with_md(bdev_node->base_desc, ch->base_ch, + bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, + bdev_io->u.bdev.md_buf, + lba, bdev_io->u.bdev.num_blocks, + _zone_block_complete_write, bdev_io); return rc; @@ -469,18 +463,11 @@ zone_block_read(struct bdev_zone_block *bdev_node, struct zone_block_io_channel return -EINVAL; } - if (bdev_io->u.bdev.md_buf == NULL) { - rc = spdk_bdev_readv_blocks(bdev_node->base_desc, ch->base_ch, bdev_io->u.bdev.iovs, - bdev_io->u.bdev.iovcnt, lba, - len, _zone_block_complete_read, - bdev_io); - } else { - rc = spdk_bdev_readv_blocks_with_md(bdev_node->base_desc, ch->base_ch, - bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, - bdev_io->u.bdev.md_buf, - lba, len, - _zone_block_complete_read, bdev_io); - } + rc = spdk_bdev_readv_blocks_with_md(bdev_node->base_desc, ch->base_ch, + bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, + bdev_io->u.bdev.md_buf, + lba, len, + _zone_block_complete_read, bdev_io); return rc; }