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

bdev: rename spdk_bdev_get_io to bdev_channel_get_io 



This function is not part of the SPDK public API, so
remove the spdk_ prefix from it to make it more clear
this is internal to the SPDK bdev library.

Also add "channel" to the name since this function is
operating on the channel parameter.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I57897ab4bf601b90551259b7cf6efa63152ed02f

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


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 a1d68e9c

lib/bdev/bdev.c

+13 −13
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ spdk_bdev_finish(spdk_bdev_fini_cb cb_fn, void *cb_arg) 
}



struct spdk_bdev_io *

spdk_bdev_get_io(struct spdk_bdev_channel *channel)

bdev_channel_get_io(struct spdk_bdev_channel *channel)

{

	struct spdk_bdev_mgmt_channel *ch = channel->shared_resource->mgmt_ch;

	struct spdk_bdev_io *bdev_io;
@@ -2790,7 +2790,7 @@ _spdk_bdev_read_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chann 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -2885,7 +2885,7 @@ _spdk_bdev_readv_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chan 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -2948,7 +2948,7 @@ _spdk_bdev_write_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_chan 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3032,7 +3032,7 @@ _spdk_bdev_writev_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_cha 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3140,7 +3140,7 @@ spdk_bdev_zcopy_start(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
		return -ENOTSUP;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3248,7 +3248,7 @@ spdk_bdev_write_zeroes_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channe 
		return -ENOTSUP;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);



	if (!bdev_io) {

		return -ENOMEM;
@@ -3312,7 +3312,7 @@ spdk_bdev_unmap_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3366,7 +3366,7 @@ spdk_bdev_flush_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
		return -EINVAL;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3473,7 +3473,7 @@ spdk_bdev_reset(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
	struct spdk_bdev_io *bdev_io;

	struct spdk_bdev_channel *channel = spdk_io_channel_get_ctx(ch);



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3570,7 +3570,7 @@ spdk_bdev_nvme_admin_passthru(struct spdk_bdev_desc *desc, struct spdk_io_channe 
		return -EBADF;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3608,7 +3608,7 @@ spdk_bdev_nvme_io_passthru(struct spdk_bdev_desc *desc, struct spdk_io_channel * 
		return -EBADF;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -3646,7 +3646,7 @@ spdk_bdev_nvme_io_passthru_md(struct spdk_bdev_desc *desc, struct spdk_io_channe 
		return -EBADF;

	}



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}

lib/bdev/bdev_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct spdk_bdev; 
struct spdk_bdev_io;

struct spdk_bdev_channel;



struct spdk_bdev_io *spdk_bdev_get_io(struct spdk_bdev_channel *channel);

struct spdk_bdev_io *bdev_channel_get_io(struct spdk_bdev_channel *channel);



void bdev_io_init(struct spdk_bdev_io *bdev_io, struct spdk_bdev *bdev, void *cb_arg,

		  spdk_bdev_io_completion_cb cb);

lib/bdev/bdev_zone.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ spdk_bdev_get_zone_info(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
	struct spdk_bdev_io *bdev_io;

	struct spdk_bdev_channel *channel = spdk_io_channel_get_ctx(ch);



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -91,7 +91,7 @@ spdk_bdev_zone_management(struct spdk_bdev_desc *desc, struct spdk_io_channel *c 
	struct spdk_bdev_io *bdev_io;

	struct spdk_bdev_channel *channel = spdk_io_channel_get_ctx(ch);



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}
@@ -117,7 +117,7 @@ _spdk_bdev_append_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *c 
	struct spdk_bdev_io *bdev_io;

	struct spdk_bdev_channel *channel = spdk_io_channel_get_ctx(ch);



	bdev_io = spdk_bdev_get_io(channel);

	bdev_io = bdev_channel_get_io(channel);

	if (!bdev_io) {

		return -ENOMEM;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ stop_operation(void) 
}



struct spdk_bdev_io *

spdk_bdev_get_io(struct spdk_bdev_channel *channel)

bdev_channel_get_io(struct spdk_bdev_channel *channel)

{

	struct spdk_bdev_io *bdev_io;