ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I7905e6d1d8e98bcefc347ebd6f094263c381a2c6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2322
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2020-05-10 00:16:18 -07:00 committed by Tomasz Zawadzki
parent 684cf6039a
commit ef78704f94
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/bdev/error/vbdev_error.c
View File

@ -96,7 +96,7 @@ static struct spdk_bdev_module error_if = {
SPDK_BDEV_MODULE_REGISTER(error, &error_if) SPDK_BDEV_MODULE_REGISTER(error, &error_if)
int 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 *bdev;
struct spdk_bdev_part *part; struct spdk_bdev_part *part;
@ -247,7 +247,7 @@ static struct spdk_bdev_fn_table vbdev_error_fn_table = {
}; };
static void 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; struct spdk_bdev_part_base *part_base = _part_base;
@ -263,7 +263,7 @@ _spdk_vbdev_error_create(struct spdk_bdev *base_bdev)
int rc; int rc;
base = spdk_bdev_part_base_construct(base_bdev, 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, &error_if, &vbdev_error_fn_table, &g_error_disks,
NULL, NULL, sizeof(struct error_channel), NULL, NULL, sizeof(struct error_channel),
NULL, NULL); NULL, NULL);
@ -304,7 +304,7 @@ _spdk_vbdev_error_create(struct spdk_bdev *base_bdev)
} }
int int
spdk_vbdev_error_create(const char *base_bdev_name) vbdev_error_create(const char *base_bdev_name)
{ {
int rc; int rc;
struct spdk_bdev *base_bdev; struct spdk_bdev *base_bdev;
@ -332,7 +332,7 @@ spdk_vbdev_error_create(const char *base_bdev_name)
} }
void 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) { if (!vbdev || vbdev->module != &error_if) {
cb_fn(cb_arg, -ENODEV); cb_fn(cb_arg, -ENODEV);

10
module/bdev/error/vbdev_error.h
View File

@ -50,7 +50,7 @@ typedef void (*spdk_delete_error_complete)(void *cb_arg, int bdeverrno);
* \param base_bdev_name Name of the base bdev. * \param base_bdev_name Name of the base bdev.
* \return 0 on success or negative on failure. * \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. * Delete vbdev used to inject errors.
@ -59,8 +59,8 @@ int spdk_vbdev_error_create(const char *base_bdev_name);
* \param cb_fn Function to call after deletion. * \param cb_fn Function to call after deletion.
* \param cb_arg Arguments to pass to cb_fn. * \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); void *cb_arg);
/** /**
* Inject error to the base bdev. Users can specify which IO type error is injected, * Inject error to the base bdev. Users can specify which IO type error is injected,
@ -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 io_type IO type into which error is injected.
* \param error_num Count of injected errors * \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); uint32_t error_num);
#endif /* SPDK_VBDEV_ERROR_H */ #endif /* SPDK_VBDEV_ERROR_H */

34
module/bdev/error/vbdev_error_rpc.c
View File

@ -43,7 +43,7 @@
#define ERROR_BDEV_ERROR_TYPE_INVALID (VBDEV_IO_PENDING + 1) #define ERROR_BDEV_ERROR_TYPE_INVALID (VBDEV_IO_PENDING + 1)
static uint32_t 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) { if (strcmp(name, "read") == 0) {
return SPDK_BDEV_IO_TYPE_READ; return SPDK_BDEV_IO_TYPE_READ;
@ -62,7 +62,7 @@ spdk_rpc_error_bdev_io_type_parse(char *name)
} }
static uint32_t 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) { if (strcmp(name, "failure") == 0) {
return VBDEV_IO_FAILURE; return VBDEV_IO_FAILURE;
@ -87,8 +87,8 @@ static const struct spdk_json_object_decoder rpc_bdev_error_create_decoders[] =
}; };
static void 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) const struct spdk_json_val *params)
{ {
struct rpc_bdev_error_create req = {}; struct rpc_bdev_error_create req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -103,7 +103,7 @@ spdk_rpc_bdev_error_create(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
rc = spdk_vbdev_error_create(req.base_name); rc = vbdev_error_create(req.base_name);
if (rc) { if (rc) {
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc)); spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup; goto cleanup;
@ -116,7 +116,7 @@ spdk_rpc_bdev_error_create(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_bdev_error_create(&req); 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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_create, construct_error_bdev)
struct rpc_delete_error { struct rpc_delete_error {
@ -134,7 +134,7 @@ static const struct spdk_json_object_decoder rpc_delete_error_decoders[] = {
}; };
static void 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_jsonrpc_request *request = cb_arg;
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -145,8 +145,8 @@ _spdk_rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno)
} }
static void 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) const struct spdk_json_val *params)
{ {
struct rpc_delete_error req = {NULL}; struct rpc_delete_error req = {NULL};
struct spdk_bdev *vbdev; struct spdk_bdev *vbdev;
@ -165,12 +165,12 @@ spdk_rpc_bdev_error_delete(struct spdk_jsonrpc_request *request,
goto cleanup; 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: cleanup:
free_rpc_delete_error(&req); 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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_delete, delete_error_bdev)
struct rpc_error_information { struct rpc_error_information {
@ -196,8 +196,8 @@ free_rpc_error_information(struct rpc_error_information *p)
} }
static void 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) const struct spdk_json_val *params)
{ {
struct rpc_error_information req = {}; struct rpc_error_information req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -214,21 +214,21 @@ spdk_rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request,
goto cleanup; 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) { if (io_type == ERROR_BDEV_IO_TYPE_INVALID) {
spdk_jsonrpc_send_error_response(request, -EINVAL, spdk_jsonrpc_send_error_response(request, -EINVAL,
"Unexpected io_type value"); "Unexpected io_type value");
goto cleanup; 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) { if (error_type == ERROR_BDEV_ERROR_TYPE_INVALID) {
spdk_jsonrpc_send_error_response(request, -EINVAL, spdk_jsonrpc_send_error_response(request, -EINVAL,
"Unexpected error_type value"); "Unexpected error_type value");
goto cleanup; 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) { if (rc) {
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc)); spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup; goto cleanup;
@ -241,5 +241,5 @@ spdk_rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_error_information(&req); 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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_inject_error, bdev_inject_error)