From a1d68e9c026cc2a05ccbf21e28186413d0c5e52b Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 18 Nov 2019 15:40:50 -0700 Subject: [PATCH] bdev: remove spdk_ prefix from spdk_bdev_io_init This is not part of the public SPDK API, so remove the spdk_ prefix to make it clear this is internal to the bdev library. Signed-off-by: Jim Harris Change-Id: Ibda76e4d8e34dde0c2fe638cb965e5ba2d9e47b5 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475030 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Alexey Marchuk Community-CI: Broadcom SPDK FC-NVMe CI --- lib/bdev/bdev.c | 30 +++++++++---------- lib/bdev/bdev_internal.h | 4 +-- lib/bdev/bdev_zone.c | 6 ++-- test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c | 6 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index c4a02e7fb..da73d833a 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1903,9 +1903,9 @@ bdev_io_submit_reset(struct spdk_bdev_io *bdev_io) } void -spdk_bdev_io_init(struct spdk_bdev_io *bdev_io, - struct spdk_bdev *bdev, void *cb_arg, - spdk_bdev_io_completion_cb cb) +bdev_io_init(struct spdk_bdev_io *bdev_io, + struct spdk_bdev *bdev, void *cb_arg, + spdk_bdev_io_completion_cb cb) { bdev_io->bdev = bdev; bdev_io->internal.caller_ctx = cb_arg; @@ -2805,7 +2805,7 @@ _spdk_bdev_read_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chann bdev_io->u.bdev.md_buf = md_buf; bdev_io->u.bdev.num_blocks = num_blocks; bdev_io->u.bdev.offset_blocks = offset_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -2898,7 +2898,7 @@ _spdk_bdev_readv_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chan bdev_io->u.bdev.md_buf = md_buf; bdev_io->u.bdev.num_blocks = num_blocks; bdev_io->u.bdev.offset_blocks = offset_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -2963,7 +2963,7 @@ _spdk_bdev_write_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chan bdev_io->u.bdev.md_buf = md_buf; bdev_io->u.bdev.num_blocks = num_blocks; bdev_io->u.bdev.offset_blocks = offset_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3045,7 +3045,7 @@ _spdk_bdev_writev_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_cha bdev_io->u.bdev.md_buf = md_buf; bdev_io->u.bdev.num_blocks = num_blocks; bdev_io->u.bdev.offset_blocks = offset_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3156,7 +3156,7 @@ spdk_bdev_zcopy_start(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, bdev_io->u.bdev.zcopy.populate = populate ? 1 : 0; bdev_io->u.bdev.zcopy.commit = 0; bdev_io->u.bdev.zcopy.start = 1; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); if (_spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_ZCOPY)) { bdev_io_submit(bdev_io); @@ -3259,7 +3259,7 @@ spdk_bdev_write_zeroes_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channe bdev_io->internal.desc = desc; bdev_io->u.bdev.offset_blocks = offset_blocks; bdev_io->u.bdev.num_blocks = num_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); if (_spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_WRITE_ZEROES)) { bdev_io_submit(bdev_io); @@ -3328,7 +3328,7 @@ spdk_bdev_unmap_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, bdev_io->u.bdev.offset_blocks = offset_blocks; bdev_io->u.bdev.num_blocks = num_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3378,7 +3378,7 @@ spdk_bdev_flush_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, bdev_io->u.bdev.iovcnt = 0; bdev_io->u.bdev.offset_blocks = offset_blocks; bdev_io->u.bdev.num_blocks = num_blocks; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3482,7 +3482,7 @@ spdk_bdev_reset(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, bdev_io->internal.desc = desc; bdev_io->type = SPDK_BDEV_IO_TYPE_RESET; bdev_io->u.reset.ch_ref = NULL; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); pthread_mutex_lock(&bdev->internal.mutex); TAILQ_INSERT_TAIL(&channel->queued_resets, bdev_io, internal.link); @@ -3584,7 +3584,7 @@ spdk_bdev_nvme_admin_passthru(struct spdk_bdev_desc *desc, struct spdk_io_channe bdev_io->u.nvme_passthru.md_buf = NULL; bdev_io->u.nvme_passthru.md_len = 0; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3622,7 +3622,7 @@ spdk_bdev_nvme_io_passthru(struct spdk_bdev_desc *desc, struct spdk_io_channel * bdev_io->u.nvme_passthru.md_buf = NULL; bdev_io->u.nvme_passthru.md_len = 0; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -3660,7 +3660,7 @@ spdk_bdev_nvme_io_passthru_md(struct spdk_bdev_desc *desc, struct spdk_io_channe bdev_io->u.nvme_passthru.md_buf = md_buf; bdev_io->u.nvme_passthru.md_len = md_len; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; diff --git a/lib/bdev/bdev_internal.h b/lib/bdev/bdev_internal.h index 3a7a56b65..b25ed9ed6 100644 --- a/lib/bdev/bdev_internal.h +++ b/lib/bdev/bdev_internal.h @@ -42,8 +42,8 @@ struct spdk_bdev_channel; struct spdk_bdev_io *spdk_bdev_get_io(struct spdk_bdev_channel *channel); -void spdk_bdev_io_init(struct spdk_bdev_io *bdev_io, struct spdk_bdev *bdev, void *cb_arg, - spdk_bdev_io_completion_cb cb); +void bdev_io_init(struct spdk_bdev_io *bdev_io, struct spdk_bdev *bdev, void *cb_arg, + spdk_bdev_io_completion_cb cb); void bdev_io_submit(struct spdk_bdev_io *bdev_io); diff --git a/lib/bdev/bdev_zone.c b/lib/bdev/bdev_zone.c index 0dace9eb8..96318ae0e 100644 --- a/lib/bdev/bdev_zone.c +++ b/lib/bdev/bdev_zone.c @@ -76,7 +76,7 @@ spdk_bdev_get_zone_info(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, bdev_io->u.zone_mgmt.zone_id = zone_id; bdev_io->u.zone_mgmt.num_zones = num_zones; bdev_io->u.zone_mgmt.buf = info; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -102,7 +102,7 @@ spdk_bdev_zone_management(struct spdk_bdev_desc *desc, struct spdk_io_channel *c bdev_io->u.zone_mgmt.zone_action = action; bdev_io->u.zone_mgmt.zone_id = zone_id; bdev_io->u.zone_mgmt.num_zones = 1; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; @@ -132,7 +132,7 @@ _spdk_bdev_append_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *c bdev_io->u.bdev.md_buf = md_buf; bdev_io->u.bdev.num_blocks = num_blocks; bdev_io->u.bdev.offset_blocks = zone_id; - spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb); + bdev_io_init(bdev_io, bdev, cb_arg, cb); bdev_io_submit(bdev_io); return 0; diff --git a/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c b/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c index 7a023adf3..e99515677 100644 --- a/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c +++ b/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c @@ -38,9 +38,9 @@ #include "bdev/bdev_zone.c" -DEFINE_STUB_V(spdk_bdev_io_init, (struct spdk_bdev_io *bdev_io, - struct spdk_bdev *bdev, void *cb_arg, - spdk_bdev_io_completion_cb cb)); +DEFINE_STUB_V(bdev_io_init, (struct spdk_bdev_io *bdev_io, + struct spdk_bdev *bdev, void *cb_arg, + spdk_bdev_io_completion_cb cb)); DEFINE_STUB_V(bdev_io_submit, (struct spdk_bdev_io *bdev_io));