Commit 666bf939 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

io_channel: Rename io_channel_create_cb_t to spdk_io_channel_create_cb 



Add spdk, remove _t

Change-Id: Ic05b405439020b5ec5f2098ab04d37a4dd3cb5b6
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/362254


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 7fb3b248

include/spdk/io_channel.h

+4 −4
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ typedef void (*spdk_thread_fn)(void *ctx); 
typedef void (*spdk_thread_pass_msg)(spdk_thread_fn fn, void *ctx,

				     void *thread_ctx);



typedef int (*io_channel_create_cb_t)(void *io_device, void *ctx_buf);

typedef void (*io_channel_destroy_cb_t)(void *io_device, void *ctx_buf);

typedef int (*spdk_io_channel_create_cb)(void *io_device, void *ctx_buf);

typedef void (*spdk_io_channel_destroy_cb)(void *io_device, void *ctx_buf);



/**

 * \brief Initializes the calling thread for I/O channel allocation.
@@ -98,8 +98,8 @@ void spdk_thread_send_msg(const struct spdk_thread *thread, spdk_thread_fn fn, v 
 *  is the size of the context buffer allocated to store references to allocated I/O

 *  channel resources.

 */

void spdk_io_device_register(void *io_device, io_channel_create_cb_t create_cb,

			     io_channel_destroy_cb_t destroy_cb, uint32_t ctx_size);

void spdk_io_device_register(void *io_device, spdk_io_channel_create_cb create_cb,

			     spdk_io_channel_destroy_cb destroy_cb, uint32_t ctx_size);



/**

 * \brief Unregister the opaque io_device context as an I/O device.

lib/util/io_channel.c

+5 −5
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static pthread_mutex_t g_devlist_mutex = PTHREAD_MUTEX_INITIALIZER; 


struct io_device {

	void			*io_device_ctx;

	io_channel_create_cb_t	create_cb;

	io_channel_destroy_cb_t	destroy_cb;

	spdk_io_channel_create_cb create_cb;

	spdk_io_channel_destroy_cb destroy_cb;

	uint32_t		ctx_size;

	TAILQ_ENTRY(io_device)	tailq;

};
@@ -53,7 +53,7 @@ struct spdk_io_channel { 
	void				*io_device;

	uint32_t			ref;

	TAILQ_ENTRY(spdk_io_channel)	tailq;

	io_channel_destroy_cb_t		destroy_cb;

	spdk_io_channel_destroy_cb	destroy_cb;



	/*

	 * Modules will allocate extra memory off the end of this structure
@@ -99,8 +99,8 @@ spdk_thread_send_msg(const struct spdk_thread *thread, spdk_thread_fn fn, void * 
}



void

spdk_io_device_register(void *io_device, io_channel_create_cb_t create_cb,

			io_channel_destroy_cb_t destroy_cb, uint32_t ctx_size)

spdk_io_device_register(void *io_device, spdk_io_channel_create_cb create_cb,

			spdk_io_channel_destroy_cb destroy_cb, uint32_t ctx_size)

{

	struct io_device *dev, *tmp;