From 36f8f8da27c2ef585d93f4219eb9d8295339acb7 Mon Sep 17 00:00:00 2001 From: Richael Zhuang Date: Fri, 9 Dec 2022 11:12:48 +0800 Subject: [PATCH] bdev: remove bdev parameter Remove bdev parameter from spdk_bdev_channel_get_histogram since it's not used. Change-Id: I89f0b142cc6f80ecf39811976995f738e4cfecdb Signed-off-by: Richael Zhuang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15837 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Mike Gerdts Reviewed-by: Shuhei Matsumoto Community-CI: Mellanox Build Bot --- include/spdk/bdev.h | 5 ++--- lib/bdev/bdev.c | 4 ++-- test/unit/lib/bdev/bdev.c/bdev_ut.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/spdk/bdev.h b/include/spdk/bdev.h index 00568b92e..21952e082 100644 --- a/include/spdk/bdev.h +++ b/include/spdk/bdev.h @@ -1951,13 +1951,12 @@ void spdk_bdev_histogram_get(struct spdk_bdev *bdev, struct spdk_histogram_data * is only valid during the execution of cb_fn. Referencing the histogram after cb_fn * returns is not supported and yields undetermined behavior. * - * \param bdev Block device. * \param ch IO channel of bdev. * \param cb_fn Callback function to process the histogram of the channel. * \param cb_arg Argument to pass to cb_fn. */ -void spdk_bdev_channel_get_histogram(struct spdk_bdev *bdev, struct spdk_io_channel *ch, - spdk_bdev_histogram_data_cb cb_fn, void *cb_arg); +void spdk_bdev_channel_get_histogram(struct spdk_io_channel *ch, spdk_bdev_histogram_data_cb cb_fn, + void *cb_arg); /** * Retrieves media events. Can only be called from the context of diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index c65418b99..4e3096d60 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -7880,8 +7880,8 @@ spdk_bdev_histogram_get(struct spdk_bdev *bdev, struct spdk_histogram_data *hist } void -spdk_bdev_channel_get_histogram(struct spdk_bdev *bdev, struct spdk_io_channel *ch, - spdk_bdev_histogram_data_cb cb_fn, void *cb_arg) +spdk_bdev_channel_get_histogram(struct spdk_io_channel *ch, spdk_bdev_histogram_data_cb cb_fn, + void *cb_arg) { struct spdk_bdev_channel *bdev_ch = __io_ch_to_bdev_ch(ch); int status = 0; diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index d9e65313b..08cf9828d 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -3506,7 +3506,7 @@ bdev_histograms(void) CU_ASSERT(g_count == 2); g_count = 0; - spdk_bdev_channel_get_histogram(bdev, ch, histogram_channel_data_cb, histogram_io_count); + spdk_bdev_channel_get_histogram(ch, histogram_channel_data_cb, histogram_io_count); CU_ASSERT(g_status == 0); CU_ASSERT(g_count == 2); @@ -3521,7 +3521,7 @@ bdev_histograms(void) poll_threads(); CU_ASSERT(g_status == -EFAULT); - spdk_bdev_channel_get_histogram(bdev, ch, histogram_channel_data_cb, NULL); + spdk_bdev_channel_get_histogram(ch, histogram_channel_data_cb, NULL); CU_ASSERT(g_status == -EFAULT); spdk_histogram_data_free(histogram);