Commit b5f13b36 authored by Jim Harris's avatar Jim Harris Committed by Darek Stojaczyk
Browse files

bdev/aio: cleanup bdev_aio.h 



* Remove unneeded include files.  Some of them belong in the .c file instead.
* Use create/delete_aio_bdev naming, removing aio_disk names
* Make some similar changes in the bdev_aio.c file for the associated ctx.

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

Reviewed-on: https://review.gerrithub.io/c/446567


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent db524432

lib/bdev/aio/bdev_aio.c

+8 −7
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include "spdk/barrier.h"

#include "spdk/bdev.h"

#include "spdk/bdev_module.h"

#include "spdk/conf.h"

#include "spdk/env.h"

#include "spdk/fd.h"
@@ -580,7 +581,7 @@ bdev_aio_group_destroy_cb(void *io_device, void *ctx_buf) 
}



struct spdk_bdev *

create_aio_disk(const char *name, const char *filename, uint32_t block_size)

create_aio_bdev(const char *name, const char *filename, uint32_t block_size)

{

	struct file_disk *fdisk;

	uint32_t detected_block_size;
@@ -679,24 +680,24 @@ error_return: 
	return NULL;

}



struct delete_aio_disk_ctx {

	spdk_delete_aio_complete cb_fn;

struct delete_aio_bdev_ctx {

	delete_aio_bdev_complete cb_fn;

	void *cb_arg;

};



static void

aio_bdev_unregister_cb(void *arg, int bdeverrno)

{

	struct delete_aio_disk_ctx *ctx = arg;

	struct delete_aio_bdev_ctx *ctx = arg;



	ctx->cb_fn(ctx->cb_arg, bdeverrno);

	free(ctx);

}



void

delete_aio_disk(struct spdk_bdev *bdev, spdk_delete_aio_complete cb_fn, void *cb_arg)

delete_aio_bdev(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg)

{

	struct delete_aio_disk_ctx *ctx;

	struct delete_aio_bdev_ctx *ctx;



	if (!bdev || bdev->module != &aio_if) {

		cb_fn(cb_arg, -ENODEV);
@@ -762,7 +763,7 @@ bdev_aio_initialize(void) 
			block_size = (uint32_t)tmp;

		}



		bdev = create_aio_disk(name, file, block_size);

		bdev = create_aio_bdev(name, file, block_size);

		if (!bdev) {

			SPDK_ERRLOG("Unable to create AIO bdev from file %s\n", file);

			i++;

lib/bdev/aio/bdev_aio.h

+3 −7
Original line number Diff line number Diff line
@@ -35,16 +35,12 @@ 
#define SPDK_BDEV_AIO_H



#include "spdk/stdinc.h"



#include "spdk/queue.h"

#include "spdk/bdev.h"



#include "spdk/bdev_module.h"



typedef void (*spdk_delete_aio_complete)(void *cb_arg, int bdeverrno);

typedef void (*delete_aio_bdev_complete)(void *cb_arg, int bdeverrno);



struct spdk_bdev *create_aio_disk(const char *name, const char *filename, uint32_t block_size);

struct spdk_bdev *create_aio_bdev(const char *name, const char *filename, uint32_t block_size);



void delete_aio_disk(struct spdk_bdev *bdev, spdk_delete_aio_complete cb_fn, void *cb_arg);

void delete_aio_bdev(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg);



#endif /* SPDK_BDEV_AIO_H */

lib/bdev/aio/bdev_aio_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	bdev = create_aio_disk(req.name, req.filename, req.block_size);

	bdev = create_aio_bdev(req.name, req.filename, req.block_size);

	if (bdev == NULL) {

		goto invalid;

	}
@@ -147,7 +147,7 @@ spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	delete_aio_disk(bdev, _spdk_rpc_delete_aio_bdev_cb, request);

	delete_aio_bdev(bdev, _spdk_rpc_delete_aio_bdev_cb, request);



	free_rpc_delete_aio(&req);