Commit a1d68e9c authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ibda76e4d8e34dde0c2fe638cb965e5ba2d9e47b5

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475030


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 6c07e9d1

lib/bdev/bdev.c

+15 −15
Original line number Diff line number Diff line
@@ -1903,7 +1903,7 @@ bdev_io_submit_reset(struct spdk_bdev_io *bdev_io) 
}



void

spdk_bdev_io_init(struct spdk_bdev_io *bdev_io,

bdev_io_init(struct spdk_bdev_io *bdev_io,

	     struct spdk_bdev *bdev, void *cb_arg,

	     spdk_bdev_io_completion_cb cb)

{
@@ -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;

lib/bdev/bdev_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 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,

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);

lib/bdev/bdev_zone.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include "bdev/bdev_zone.c"



DEFINE_STUB_V(spdk_bdev_io_init, (struct spdk_bdev_io *bdev_io,

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));