Commit ef78704f authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

module/bdev_error: remove spdk prefix from static/internal functions. 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I7905e6d1d8e98bcefc347ebd6f094263c381a2c6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2322


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 684cf603

module/bdev/error/vbdev_error.c

+5 −5
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct spdk_bdev_module error_if = { 
SPDK_BDEV_MODULE_REGISTER(error, &error_if)



int

spdk_vbdev_error_inject_error(char *name, uint32_t io_type, uint32_t error_type, uint32_t error_num)

vbdev_error_inject_error(char *name, uint32_t io_type, uint32_t error_type, uint32_t error_num)

{

	struct spdk_bdev *bdev;

	struct spdk_bdev_part *part;
@@ -247,7 +247,7 @@ static struct spdk_bdev_fn_table vbdev_error_fn_table = { 
};



static void

spdk_vbdev_error_base_bdev_hotremove_cb(void *_part_base)

vbdev_error_base_bdev_hotremove_cb(void *_part_base)

{

	struct spdk_bdev_part_base *part_base = _part_base;
@@ -263,7 +263,7 @@ _spdk_vbdev_error_create(struct spdk_bdev *base_bdev) 
	int rc;



	base = spdk_bdev_part_base_construct(base_bdev,

					     spdk_vbdev_error_base_bdev_hotremove_cb,

					     vbdev_error_base_bdev_hotremove_cb,

					     &error_if, &vbdev_error_fn_table, &g_error_disks,

					     NULL, NULL, sizeof(struct error_channel),

					     NULL, NULL);
@@ -304,7 +304,7 @@ _spdk_vbdev_error_create(struct spdk_bdev *base_bdev) 
}



int

spdk_vbdev_error_create(const char *base_bdev_name)

vbdev_error_create(const char *base_bdev_name)

{

	int rc;

	struct spdk_bdev *base_bdev;
@@ -332,7 +332,7 @@ spdk_vbdev_error_create(const char *base_bdev_name) 
}



void

spdk_vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn, void *cb_arg)

vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn, void *cb_arg)

{

	if (!vbdev || vbdev->module != &error_if) {

		cb_fn(cb_arg, -ENODEV);

module/bdev/error/vbdev_error.h

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ typedef void (*spdk_delete_error_complete)(void *cb_arg, int bdeverrno); 
 * \param base_bdev_name Name of the base bdev.

 * \return 0 on success or negative on failure.

 */

int spdk_vbdev_error_create(const char *base_bdev_name);

int vbdev_error_create(const char *base_bdev_name);



/**

 * Delete vbdev used to inject errors.
@@ -59,7 +59,7 @@ int spdk_vbdev_error_create(const char *base_bdev_name); 
 * \param cb_fn Function to call after deletion.

 * \param cb_arg Arguments to pass to cb_fn.

 */

void spdk_vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn,

void vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn,

			void *cb_arg);



/**
@@ -70,7 +70,7 @@ void spdk_vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete 
 * \param io_type IO type into which error is injected.

 * \param error_num Count of injected errors

 */

int spdk_vbdev_error_inject_error(char *name, uint32_t io_type, uint32_t error_type,

int vbdev_error_inject_error(char *name, uint32_t io_type, uint32_t error_type,

			     uint32_t error_num);



#endif /* SPDK_VBDEV_ERROR_H */

module/bdev/error/vbdev_error_rpc.c

+17 −17
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define ERROR_BDEV_ERROR_TYPE_INVALID (VBDEV_IO_PENDING + 1)



static uint32_t

spdk_rpc_error_bdev_io_type_parse(char *name)

rpc_error_bdev_io_type_parse(char *name)

{

	if (strcmp(name, "read") == 0) {

		return SPDK_BDEV_IO_TYPE_READ;
@@ -62,7 +62,7 @@ spdk_rpc_error_bdev_io_type_parse(char *name) 
}



static uint32_t

spdk_rpc_error_bdev_error_type_parse(char *name)

rpc_error_bdev_error_type_parse(char *name)

{

	if (strcmp(name, "failure") == 0) {

		return VBDEV_IO_FAILURE;
@@ -87,7 +87,7 @@ static const struct spdk_json_object_decoder rpc_bdev_error_create_decoders[] = 
};



static void

spdk_rpc_bdev_error_create(struct spdk_jsonrpc_request *request,

rpc_bdev_error_create(struct spdk_jsonrpc_request *request,

		      const struct spdk_json_val *params)

{

	struct rpc_bdev_error_create req = {};
@@ -103,7 +103,7 @@ spdk_rpc_bdev_error_create(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	rc = spdk_vbdev_error_create(req.base_name);

	rc = vbdev_error_create(req.base_name);

	if (rc) {

		spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));

		goto cleanup;
@@ -116,7 +116,7 @@ spdk_rpc_bdev_error_create(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_bdev_error_create(&req);

}

SPDK_RPC_REGISTER("bdev_error_create", spdk_rpc_bdev_error_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_error_create", rpc_bdev_error_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_create, construct_error_bdev)



struct rpc_delete_error {
@@ -134,7 +134,7 @@ static const struct spdk_json_object_decoder rpc_delete_error_decoders[] = { 
};



static void

_spdk_rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno)

rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w;
@@ -145,7 +145,7 @@ _spdk_rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_bdev_error_delete(struct spdk_jsonrpc_request *request,

rpc_bdev_error_delete(struct spdk_jsonrpc_request *request,

		      const struct spdk_json_val *params)

{

	struct rpc_delete_error req = {NULL};
@@ -165,12 +165,12 @@ spdk_rpc_bdev_error_delete(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	spdk_vbdev_error_delete(vbdev, _spdk_rpc_bdev_error_delete_cb, request);

	vbdev_error_delete(vbdev, rpc_bdev_error_delete_cb, request);



cleanup:

	free_rpc_delete_error(&req);

}

SPDK_RPC_REGISTER("bdev_error_delete", spdk_rpc_bdev_error_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_error_delete", rpc_bdev_error_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_delete, delete_error_bdev)



struct rpc_error_information {
@@ -196,7 +196,7 @@ free_rpc_error_information(struct rpc_error_information *p) 
}



static void

spdk_rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request,

rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request,

			    const struct spdk_json_val *params)

{

	struct rpc_error_information req = {};
@@ -214,21 +214,21 @@ spdk_rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	io_type = spdk_rpc_error_bdev_io_type_parse(req.io_type);

	io_type = rpc_error_bdev_io_type_parse(req.io_type);

	if (io_type == ERROR_BDEV_IO_TYPE_INVALID) {

		spdk_jsonrpc_send_error_response(request, -EINVAL,

						 "Unexpected io_type value");

		goto cleanup;

	}



	error_type = spdk_rpc_error_bdev_error_type_parse(req.error_type);

	error_type = rpc_error_bdev_error_type_parse(req.error_type);

	if (error_type == ERROR_BDEV_ERROR_TYPE_INVALID) {

		spdk_jsonrpc_send_error_response(request, -EINVAL,

						 "Unexpected error_type value");

		goto cleanup;

	}



	rc = spdk_vbdev_error_inject_error(req.name, io_type, error_type, req.num);

	rc = vbdev_error_inject_error(req.name, io_type, error_type, req.num);

	if (rc) {

		spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));

		goto cleanup;
@@ -241,5 +241,5 @@ spdk_rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_error_information(&req);

}

SPDK_RPC_REGISTER("bdev_error_inject_error", spdk_rpc_bdev_error_inject_error, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_error_inject_error", rpc_bdev_error_inject_error, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_inject_error, bdev_inject_error)