From d73077b84a71985da1db1c9847ea7c042189bae2 Mon Sep 17 00:00:00 2001 From: yidong0635 Date: Fri, 6 Nov 2020 11:58:30 -0500 Subject: [PATCH] lib/jsonrpc: Add a new API to send response for writing bool result. There are many duplicated codes about sending response for writing bool result. That we need a function to do this. Then we can reduce many codes. Signed-off-by: yidong0635 Change-Id: Ic439111b1e9ca1013f8c657ab925f0c27a7be699 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5033 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- CHANGELOG.md | 5 + include/spdk/jsonrpc.h | 8 ++ lib/bdev/bdev_rpc.c | 26 +---- lib/event/app.c | 15 +-- lib/event/app_rpc.c | 15 +-- lib/event/log_rpc.c | 25 +--- lib/iscsi/iscsi_rpc.c | 108 ++++-------------- lib/jsonrpc/Makefile | 2 +- lib/jsonrpc/jsonrpc_server.c | 11 ++ lib/jsonrpc/spdk_jsonrpc.map | 1 + lib/nbd/nbd_rpc.c | 5 +- lib/net/net_rpc.c | 10 +- lib/nvmf/nvmf_rpc.c | 49 ++------ lib/sock/sock_rpc.c | 10 +- lib/trace/trace_rpc.c | 10 +- lib/vhost/vhost_rpc.c | 27 +---- module/accel/idxd/accel_engine_idxd_rpc.c | 5 +- module/accel/ioat/accel_engine_ioat_rpc.c | 5 +- module/bdev/aio/bdev_aio_rpc.c | 4 +- module/bdev/compress/vbdev_compress_rpc.c | 12 +- module/bdev/crypto/vbdev_crypto_rpc.c | 4 +- module/bdev/delay/vbdev_delay_rpc.c | 10 +- module/bdev/error/vbdev_error_rpc.c | 15 +-- module/bdev/ftl/bdev_ftl_rpc.c | 4 +- module/bdev/iscsi/bdev_iscsi_rpc.c | 4 +- module/bdev/lvol/vbdev_lvol_rpc.c | 35 ++---- module/bdev/malloc/bdev_malloc_rpc.c | 4 +- module/bdev/null/bdev_null_rpc.c | 4 +- module/bdev/nvme/bdev_nvme_cuse_rpc.c | 10 +- module/bdev/nvme/bdev_nvme_rpc.c | 14 +-- module/bdev/nvme/bdev_ocssd_rpc.c | 5 +- module/bdev/nvme/vbdev_opal_rpc.c | 25 +--- module/bdev/ocf/vbdev_ocf_rpc.c | 5 +- module/bdev/passthru/vbdev_passthru_rpc.c | 5 +- module/bdev/pmem/bdev_pmem_rpc.c | 14 +-- module/bdev/raid/bdev_raid_rpc.c | 10 +- module/bdev/rbd/bdev_rbd_rpc.c | 10 +- module/bdev/split/vbdev_split_rpc.c | 5 +- module/bdev/uring/bdev_uring_rpc.c | 4 +- module/bdev/virtio/bdev_virtio_rpc.c | 5 +- module/bdev/zone_block/vbdev_zone_block_rpc.c | 5 +- module/blobfs/bdev/blobfs_bdev_rpc.c | 20 +--- module/event/subsystems/nvmf/nvmf_rpc.c | 10 +- module/event/subsystems/vmd/vmd_rpc.c | 5 +- test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c | 5 +- .../passthru/vbdev_passthru_rpc.c | 5 +- test/rpc_client/rpc_client_test.c | 15 +-- .../lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c | 2 + .../vbdev_zone_block.c/vbdev_zone_block_ut.c | 2 + 49 files changed, 148 insertions(+), 466 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 187927fcf..b23b68809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ The SPDK nvmf target now supports async event notification for discovery log cha This allows the initiator to create persistent connection to discovery controller and be notified of any discovery log changes. +### json + +A new API `spdk_jsonrpc_send_bool_response` was added to allow sending response for +writing json bool results into one function. + ## v20.10: ### accel diff --git a/include/spdk/jsonrpc.h b/include/spdk/jsonrpc.h index 650a06ff4..65413d7b2 100644 --- a/include/spdk/jsonrpc.h +++ b/include/spdk/jsonrpc.h @@ -198,6 +198,14 @@ struct spdk_json_write_ctx *spdk_jsonrpc_begin_result(struct spdk_jsonrpc_reques */ void spdk_jsonrpc_end_result(struct spdk_jsonrpc_request *request, struct spdk_json_write_ctx *w); +/** + * Complete a JSON-RPC response and write bool result. + * + * \param request Request to complete the response for. + * \param value Write bool result value. + */ +void spdk_jsonrpc_send_bool_response(struct spdk_jsonrpc_request *request, bool value); + /** * Send an error response to a JSON-RPC request. * diff --git a/lib/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c index 1e799a598..6e56041a2 100644 --- a/lib/bdev/bdev_rpc.c +++ b/lib/bdev/bdev_rpc.c @@ -59,7 +59,6 @@ rpc_bdev_set_options(struct spdk_jsonrpc_request *request, const struct spdk_jso { struct spdk_rpc_set_bdev_opts rpc_opts; struct spdk_bdev_opts bdev_opts; - struct spdk_json_write_ctx *w; int rc; rpc_opts.bdev_io_pool_size = UINT32_MAX; @@ -93,9 +92,7 @@ rpc_bdev_set_options(struct spdk_jsonrpc_request *request, const struct spdk_jso return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("bdev_set_options", rpc_bdev_set_options, SPDK_RPC_STARTUP) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_set_options, set_bdev_options) @@ -119,7 +116,6 @@ rpc_bdev_examine_bdev(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_examine req = {NULL}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_examine_bdev_decoders, @@ -136,9 +132,8 @@ rpc_bdev_examine_bdev(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc)); goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_examine(&req); @@ -489,7 +484,6 @@ rpc_bdev_set_qd_sampling_period(struct spdk_jsonrpc_request *request, { struct rpc_bdev_set_qd_sampling_period req = {0}; struct spdk_bdev *bdev; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_bdev_set_qd_sampling_period_decoders, SPDK_COUNTOF(rpc_bdev_set_qd_sampling_period_decoders), @@ -507,11 +501,8 @@ rpc_bdev_set_qd_sampling_period(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); spdk_bdev_set_qd_sampling_period(bdev, req.period); - - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_set_qd_sampling_period(&req); @@ -561,7 +552,6 @@ static void rpc_bdev_set_qos_limit_complete(void *cb_arg, int status) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; if (status != 0) { spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, @@ -570,9 +560,7 @@ rpc_bdev_set_qos_limit_complete(void *cb_arg, int status) return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -641,10 +629,8 @@ static void bdev_histogram_status_cb(void *cb_arg, int status) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, status == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, status == 0); } static void diff --git a/lib/event/app.c b/lib/event/app.c index 8c18e1940..48268b0bb 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -866,7 +866,6 @@ static void rpc_framework_start_init_cpl(int rc, void *arg1) { struct spdk_jsonrpc_request *request = arg1; - struct spdk_json_write_ctx *w; assert(spdk_get_thread() == g_app_thread); @@ -879,9 +878,7 @@ rpc_framework_start_init_cpl(int rc, void *arg1) spdk_rpc_set_state(SPDK_RPC_RUNTIME); app_start_application(); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -907,13 +904,10 @@ struct subsystem_init_poller_ctx { static int rpc_subsystem_init_poller_ctx(void *ctx) { - struct spdk_json_write_ctx *w; struct subsystem_init_poller_ctx *poller_ctx = ctx; if (spdk_rpc_get_state() == SPDK_RPC_RUNTIME) { - w = spdk_jsonrpc_begin_result(poller_ctx->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(poller_ctx->request, w); + spdk_jsonrpc_send_bool_response(poller_ctx->request, true); spdk_poller_unregister(&poller_ctx->init_poller); free(poller_ctx); } @@ -925,13 +919,10 @@ static void rpc_framework_wait_init(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct spdk_json_write_ctx *w; struct subsystem_init_poller_ctx *ctx; if (spdk_rpc_get_state() == SPDK_RPC_RUNTIME) { - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } else { ctx = malloc(sizeof(struct subsystem_init_poller_ctx)); if (ctx == NULL) { diff --git a/lib/event/app_rpc.c b/lib/event/app_rpc.c index 746425145..f7e1d346d 100644 --- a/lib/event/app_rpc.c +++ b/lib/event/app_rpc.c @@ -76,7 +76,6 @@ rpc_spdk_kill_instance(struct spdk_jsonrpc_request *request, size_t i, sig_count; int signal; struct rpc_spdk_kill_instance req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_spdk_kill_instance_decoders, SPDK_COUNTOF(rpc_spdk_kill_instance_decoders), @@ -102,9 +101,7 @@ rpc_spdk_kill_instance(struct spdk_jsonrpc_request *request, free_rpc_spdk_kill_instance(&req); kill(getpid(), signals[i].signal); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -452,7 +449,6 @@ rpc_framework_set_scheduler(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_set_scheduler_ctx req = {NULL}; - struct spdk_json_write_ctx *w; int ret; ret = spdk_json_decode_object(params, rpc_set_scheduler_decoders, @@ -471,9 +467,7 @@ rpc_framework_set_scheduler(struct spdk_jsonrpc_request *request, goto end; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); end: free_rpc_framework_set_scheduler(&req); @@ -491,12 +485,9 @@ static void rpc_thread_set_cpumask_done(void *_ctx) { struct rpc_thread_set_cpumask_ctx *ctx = _ctx; - struct spdk_json_write_ctx *w; if (ctx->status == 0) { - w = spdk_jsonrpc_begin_result(ctx->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(ctx->request, w); + spdk_jsonrpc_send_bool_response(ctx->request, true); } else { spdk_jsonrpc_send_error_response(ctx->request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_strerror(-ctx->status)); diff --git a/lib/event/log_rpc.c b/lib/event/log_rpc.c index 9823d64a9..9666dbd56 100644 --- a/lib/event/log_rpc.c +++ b/lib/event/log_rpc.c @@ -104,7 +104,6 @@ rpc_log_set_print_level(struct spdk_jsonrpc_request *request, { struct rpc_log_level req = {}; int level; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_log_level_decoders, SPDK_COUNTOF(rpc_log_level_decoders), &req)) { @@ -125,9 +124,7 @@ rpc_log_set_print_level(struct spdk_jsonrpc_request *request, spdk_log_set_print_level(level); free_rpc_log_level(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -174,7 +171,6 @@ rpc_log_set_level(struct spdk_jsonrpc_request *request, { struct rpc_log_level req = {}; int level; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_log_level_decoders, SPDK_COUNTOF(rpc_log_level_decoders), &req)) { @@ -196,9 +192,7 @@ rpc_log_set_level(struct spdk_jsonrpc_request *request, spdk_log_set_level(level); free_rpc_log_level(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -242,7 +236,6 @@ rpc_log_set_flag(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_log_flag req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_log_flag_decoders, SPDK_COUNTOF(rpc_log_flag_decoders), &req)) { @@ -262,9 +255,7 @@ rpc_log_set_flag(struct spdk_jsonrpc_request *request, spdk_log_set_flag(req.flag); free_rpc_log_flag(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -278,7 +269,6 @@ rpc_log_clear_flag(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_log_flag req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_log_flag_decoders, SPDK_COUNTOF(rpc_log_flag_decoders), &req)) { @@ -298,9 +288,7 @@ rpc_log_clear_flag(struct spdk_jsonrpc_request *request, spdk_log_clear_flag(req.flag); free_rpc_log_flag(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -350,7 +338,6 @@ rpc_log_enable_timestamps(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_log_enable_timestamps req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_log_enable_timestamps_decoders, SPDK_COUNTOF(rpc_log_enable_timestamps_decoders), @@ -363,9 +350,7 @@ rpc_log_enable_timestamps(struct spdk_jsonrpc_request *request, spdk_log_enable_timestamps(req.enabled); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("log_enable_timestamps", rpc_log_enable_timestamps, SPDK_RPC_RUNTIME) SPDK_LOG_REGISTER_COMPONENT(log_rpc) diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index e413c70cb..3051b659a 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -138,7 +138,6 @@ rpc_iscsi_create_initiator_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_initiator_group req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_initiator_group_decoders, SPDK_COUNTOF(rpc_initiator_group_decoders), &req)) { @@ -162,9 +161,7 @@ rpc_iscsi_create_initiator_group(struct spdk_jsonrpc_request *request, free_rpc_initiator_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -186,7 +183,6 @@ rpc_iscsi_initiator_group_add_initiators(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_initiator_group req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_add_or_delete_initiators_decoders, SPDK_COUNTOF(rpc_add_or_delete_initiators_decoders), &req)) { @@ -205,9 +201,7 @@ rpc_iscsi_initiator_group_add_initiators(struct spdk_jsonrpc_request *request, free_rpc_initiator_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -224,7 +218,6 @@ rpc_iscsi_initiator_group_remove_initiators(struct spdk_jsonrpc_request *request const struct spdk_json_val *params) { struct rpc_initiator_group req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_add_or_delete_initiators_decoders, SPDK_COUNTOF(rpc_add_or_delete_initiators_decoders), &req)) { @@ -243,9 +236,7 @@ rpc_iscsi_initiator_group_remove_initiators(struct spdk_jsonrpc_request *request free_rpc_initiator_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -270,7 +261,6 @@ rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_iscsi_delete_initiator_group req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_init_grp *ig; if (spdk_json_decode_object(params, rpc_iscsi_delete_initiator_group_decoders, @@ -287,9 +277,7 @@ rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request, iscsi_tgt_node_delete_map(NULL, ig); iscsi_init_grp_destroy(ig); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -446,7 +434,6 @@ rpc_iscsi_create_target_node(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_target_node req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_tgt_node *target; int32_t pg_tags[MAX_TARGET_MAP] = {0}, ig_tags[MAX_TARGET_MAP] = {0}; char *bdev_names[RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN] = {0}; @@ -496,9 +483,7 @@ rpc_iscsi_create_target_node(struct spdk_jsonrpc_request *request, free_rpc_target_node(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -523,7 +508,6 @@ rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_tgt_node_pg_ig_maps req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_tgt_node *target; int32_t pg_tags[MAX_TARGET_MAP] = {0}, ig_tags[MAX_TARGET_MAP] = {0}; size_t i; @@ -556,9 +540,7 @@ rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, free(req.name); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -575,7 +557,6 @@ rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_tgt_node_pg_ig_maps req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_tgt_node *target; int32_t pg_tags[MAX_TARGET_MAP] = {0}, ig_tags[MAX_TARGET_MAP] = {0}; size_t i; @@ -608,9 +589,7 @@ rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *request, free(req.name); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -646,14 +625,9 @@ static void rpc_iscsi_delete_target_node_done(void *cb_arg, int rc) { struct rpc_iscsi_delete_target_node_ctx *ctx = cb_arg; - struct spdk_json_write_ctx *w; free_rpc_iscsi_delete_target_node(&ctx->req); - - w = spdk_jsonrpc_begin_result(ctx->request); - spdk_json_write_bool(w, rc == 0); - spdk_jsonrpc_end_result(ctx->request, w); - + spdk_jsonrpc_send_bool_response(ctx->request, rc == 0); free(ctx); } @@ -795,7 +769,6 @@ rpc_iscsi_create_portal_group(struct spdk_jsonrpc_request *request, struct rpc_portal_group req = {}; struct spdk_iscsi_portal_grp *pg = NULL; struct spdk_iscsi_portal *portal; - struct spdk_json_write_ctx *w; size_t i = 0; int rc = -1; @@ -834,9 +807,7 @@ rpc_iscsi_create_portal_group(struct spdk_jsonrpc_request *request, out: if (rc == 0) { - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } else { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); @@ -862,7 +833,6 @@ rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_iscsi_delete_portal_group req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_portal_grp *pg; if (spdk_json_decode_object(params, rpc_iscsi_delete_portal_group_decoders, @@ -880,9 +850,7 @@ rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, iscsi_tgt_node_delete_map(pg, NULL); iscsi_portal_grp_release(pg); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -912,7 +880,6 @@ rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_portal_group_auth req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_portal_grp *pg; int rc; @@ -943,10 +910,7 @@ rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, pthread_mutex_unlock(&g_iscsi.mutex); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); - + spdk_jsonrpc_send_bool_response(request, true); return; exit: @@ -1042,7 +1006,6 @@ rpc_iscsi_target_node_add_lun(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_target_lun req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_tgt_node *target; int rc; @@ -1068,9 +1031,7 @@ rpc_iscsi_target_node_add_lun(struct spdk_jsonrpc_request *request, free_rpc_target_lun(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -1108,7 +1069,6 @@ rpc_iscsi_target_node_set_auth(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_target_auth req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_tgt_node *target; int rc; @@ -1137,9 +1097,7 @@ rpc_iscsi_target_node_set_auth(struct spdk_jsonrpc_request *request, free_rpc_target_auth(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; exit: @@ -1177,7 +1135,6 @@ rpc_iscsi_target_node_set_redirect(struct spdk_jsonrpc_request *request, { struct rpc_target_redirect req = {}; struct spdk_iscsi_tgt_node *target; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_target_redirect_decoders, @@ -1211,9 +1168,7 @@ rpc_iscsi_target_node_set_redirect(struct spdk_jsonrpc_request *request, free_rpc_target_redirect(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_target_node_set_redirect", rpc_iscsi_target_node_set_redirect, SPDK_RPC_RUNTIME) @@ -1240,7 +1195,6 @@ rpc_iscsi_target_node_request_logout(struct spdk_jsonrpc_request *request, { struct rpc_target_logout req = {}; struct spdk_iscsi_tgt_node *target; - struct spdk_json_write_ctx *w; /* If pg_tag is omitted, request all connections to the specified target * to logout. @@ -1270,9 +1224,7 @@ rpc_iscsi_target_node_request_logout(struct spdk_jsonrpc_request *request, free_rpc_target_logout(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_target_node_request_logout", rpc_iscsi_target_node_request_logout, SPDK_RPC_RUNTIME) @@ -1316,7 +1268,6 @@ rpc_iscsi_set_discovery_auth(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_discovery_auth req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_discovery_auth_decoders, @@ -1335,9 +1286,7 @@ rpc_iscsi_set_discovery_auth(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_set_discovery_auth", rpc_iscsi_set_discovery_auth, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_discovery_auth, set_iscsi_discovery_auth) @@ -1423,7 +1372,6 @@ rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, { struct rpc_auth_group req = {}; struct rpc_auth_secret *_secret; - struct spdk_json_write_ctx *w; struct spdk_iscsi_auth_group *group = NULL; int rc; size_t i; @@ -1470,9 +1418,7 @@ rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, free_rpc_auth_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_create_auth_group", rpc_iscsi_create_auth_group, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_auth_group, add_iscsi_auth_group) @@ -1490,7 +1436,6 @@ rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_delete_auth_group req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_auth_group *group; if (spdk_json_decode_object(params, rpc_delete_auth_group_decoders, @@ -1516,9 +1461,7 @@ rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request, pthread_mutex_unlock(&g_iscsi.mutex); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_delete_auth_group", rpc_iscsi_delete_auth_group, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_auth_group, delete_iscsi_auth_group) @@ -1553,7 +1496,6 @@ rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_add_auth_secret req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_auth_group *group; int rc; @@ -1593,9 +1535,7 @@ rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, free_rpc_add_auth_secret(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_auth_group_add_secret", rpc_iscsi_auth_group_add_secret, SPDK_RPC_RUNTIME) @@ -1623,7 +1563,6 @@ rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_remove_auth_secret req = {}; - struct spdk_json_write_ctx *w; struct spdk_iscsi_auth_group *group; int rc; @@ -1663,9 +1602,7 @@ rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, free_rpc_remove_auth_secret(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_auth_group_remove_secret", rpc_iscsi_auth_group_remove_secret, SPDK_RPC_RUNTIME) @@ -1725,7 +1662,6 @@ rpc_iscsi_set_options(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_iscsi_opts *opts; - struct spdk_json_write_ctx *w; if (g_spdk_iscsi_opts != NULL) { SPDK_ERRLOG("this RPC must not be called more than once.\n"); @@ -1763,9 +1699,7 @@ rpc_iscsi_set_options(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_set_options", rpc_iscsi_set_options, SPDK_RPC_STARTUP) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_options, set_iscsi_options) diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile index 7eb8dd683..7afd832ff 100644 --- a/lib/jsonrpc/Makefile +++ b/lib/jsonrpc/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk SO_VER := 2 -SO_MINOR := 0 +SO_MINOR := 1 LIBNAME = jsonrpc C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c diff --git a/lib/jsonrpc/jsonrpc_server.c b/lib/jsonrpc/jsonrpc_server.c index 171cdde6f..52b242c71 100644 --- a/lib/jsonrpc/jsonrpc_server.c +++ b/lib/jsonrpc/jsonrpc_server.c @@ -327,6 +327,17 @@ spdk_jsonrpc_end_result(struct spdk_jsonrpc_request *request, struct spdk_json_w } } +void +spdk_jsonrpc_send_bool_response(struct spdk_jsonrpc_request *request, bool value) +{ + struct spdk_json_write_ctx *w; + + w = spdk_jsonrpc_begin_result(request); + assert(w != NULL); + spdk_json_write_bool(w, value); + spdk_jsonrpc_end_result(request, w); +} + void spdk_jsonrpc_send_error_response(struct spdk_jsonrpc_request *request, int error_code, const char *msg) diff --git a/lib/jsonrpc/spdk_jsonrpc.map b/lib/jsonrpc/spdk_jsonrpc.map index 461fd0766..9435be882 100644 --- a/lib/jsonrpc/spdk_jsonrpc.map +++ b/lib/jsonrpc/spdk_jsonrpc.map @@ -10,6 +10,7 @@ spdk_jsonrpc_conn_del_close_cb; spdk_jsonrpc_begin_result; spdk_jsonrpc_end_result; + spdk_jsonrpc_send_bool_response; spdk_jsonrpc_send_error_response; spdk_jsonrpc_send_error_response_fmt; spdk_jsonrpc_begin_request; diff --git a/lib/nbd/nbd_rpc.c b/lib/nbd/nbd_rpc.c index 44990aec1..d10254021 100644 --- a/lib/nbd/nbd_rpc.c +++ b/lib/nbd/nbd_rpc.c @@ -257,15 +257,12 @@ static void * nbd_disconnect_thread(void *arg) { struct nbd_disconnect_arg *thd_arg = arg; - struct spdk_json_write_ctx *w; spdk_unaffinitize_thread(); nbd_disconnect(thd_arg->nbd); - w = spdk_jsonrpc_begin_result(thd_arg->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(thd_arg->request, w); + spdk_jsonrpc_send_bool_response(thd_arg->request, true); free(thd_arg); pthread_exit(NULL); diff --git a/lib/net/net_rpc.c b/lib/net/net_rpc.c index d557cb48d..1af504d0e 100644 --- a/lib/net/net_rpc.c +++ b/lib/net/net_rpc.c @@ -62,7 +62,6 @@ rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_ip_address req = {}; - struct spdk_json_write_ctx *w; int ret_val = 0; if (spdk_json_decode_object(params, rpc_ip_address_decoders, @@ -92,9 +91,7 @@ rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request, free_rpc_ip_address(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -109,7 +106,6 @@ rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_ip_address req = {}; - struct spdk_json_write_ctx *w; int ret_val = 0; if (spdk_json_decode_object(params, rpc_ip_address_decoders, @@ -139,9 +135,7 @@ rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request, free_rpc_ip_address(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c index 29d895c51..b4d1a3bde 100644 --- a/lib/nvmf/nvmf_rpc.c +++ b/lib/nvmf/nvmf_rpc.c @@ -363,9 +363,7 @@ rpc_nvmf_subsystem_started(struct spdk_nvmf_subsystem *subsystem, struct spdk_jsonrpc_request *request = cb_arg; if (!status) { - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } else { spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "Subsystem %s start failed", @@ -475,7 +473,6 @@ rpc_nvmf_subsystem_set_options(struct spdk_jsonrpc_request *request, struct rpc_subsystem_set_options *req; struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_transport *transport; - struct spdk_json_write_ctx *w; struct spdk_nvmf_tgt *tgt; int rc; @@ -533,9 +530,7 @@ rpc_nvmf_subsystem_set_options(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free(req->nqn); @@ -562,14 +557,11 @@ rpc_nvmf_subsystem_stopped(struct spdk_nvmf_subsystem *subsystem, void *cb_arg, int status) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; nvmf_subsystem_remove_all_listeners(subsystem, true); spdk_nvmf_subsystem_destroy(subsystem); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static const struct spdk_json_object_decoder rpc_delete_subsystem_decoders[] = { @@ -717,7 +709,6 @@ nvmf_rpc_listen_resumed(struct spdk_nvmf_subsystem *subsystem, { struct nvmf_rpc_listener_ctx *ctx = cb_arg; struct spdk_jsonrpc_request *request; - struct spdk_json_write_ctx *w; request = ctx->request; if (ctx->response_sent) { @@ -728,9 +719,7 @@ nvmf_rpc_listen_resumed(struct spdk_nvmf_subsystem *subsystem, nvmf_rpc_listener_ctx_free(ctx); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -1380,7 +1369,6 @@ nvmf_rpc_remove_ns_resumed(struct spdk_nvmf_subsystem *subsystem, struct nvmf_rpc_remove_ns_ctx *ctx = cb_arg; struct spdk_jsonrpc_request *request = ctx->request; bool response_sent = ctx->response_sent; - struct spdk_json_write_ctx *w; nvmf_rpc_remove_ns_ctx_free(ctx); @@ -1388,9 +1376,7 @@ nvmf_rpc_remove_ns_resumed(struct spdk_nvmf_subsystem *subsystem, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -1502,7 +1488,6 @@ rpc_nvmf_subsystem_add_host(struct spdk_jsonrpc_request *request, struct nvmf_rpc_host_ctx ctx = {}; struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_tgt *tgt; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, nvmf_rpc_subsystem_host_decoder, @@ -1538,9 +1523,7 @@ rpc_nvmf_subsystem_add_host(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); nvmf_rpc_host_ctx_free(&ctx); } SPDK_RPC_REGISTER("nvmf_subsystem_add_host", rpc_nvmf_subsystem_add_host, SPDK_RPC_RUNTIME) @@ -1549,11 +1532,8 @@ static void rpc_nvmf_subsystem_remove_host_done(void *_ctx, int status) { struct nvmf_rpc_host_ctx *ctx = _ctx; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(ctx->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(ctx->request, w); + spdk_jsonrpc_send_bool_response(ctx->request, true); nvmf_rpc_host_ctx_free(ctx); free(ctx); } @@ -1640,7 +1620,6 @@ rpc_nvmf_subsystem_allow_any_host(struct spdk_jsonrpc_request *request, struct nvmf_rpc_host_ctx ctx = {}; struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_tgt *tgt; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, nvmf_rpc_subsystem_any_host_decoder, @@ -1676,9 +1655,7 @@ rpc_nvmf_subsystem_allow_any_host(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); nvmf_rpc_host_ctx_free(&ctx); } SPDK_RPC_REGISTER("nvmf_subsystem_allow_any_host", rpc_nvmf_subsystem_allow_any_host, @@ -1747,11 +1724,8 @@ static void nvmf_rpc_destroy_target_done(void *ctx, int status) { struct spdk_jsonrpc_request *request = ctx; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -1927,7 +1901,6 @@ nvmf_rpc_tgt_add_transport_done(void *cb_arg, int status) { struct nvmf_rpc_create_transport_ctx *ctx = cb_arg; struct spdk_jsonrpc_request *request; - struct spdk_json_write_ctx *w; request = ctx->request; nvmf_rpc_create_transport_ctx_free(ctx); @@ -1940,9 +1913,7 @@ nvmf_rpc_tgt_add_transport_done(void *cb_arg, int status) return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void diff --git a/lib/sock/sock_rpc.c b/lib/sock/sock_rpc.c index 2ffe2d80e..a8680ad57 100644 --- a/lib/sock/sock_rpc.c +++ b/lib/sock/sock_rpc.c @@ -126,7 +126,6 @@ rpc_sock_impl_set_options(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_rpc_sock_impl_set_opts opts = {}; - struct spdk_json_write_ctx *w; size_t len; int rc; @@ -166,9 +165,7 @@ rpc_sock_impl_set_options(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); free(opts.impl_name); } SPDK_RPC_REGISTER("sock_impl_set_options", rpc_sock_impl_set_options, SPDK_RPC_STARTUP) @@ -178,7 +175,6 @@ rpc_sock_set_default_impl(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { char *impl_name = NULL; - struct spdk_json_write_ctx *w; int rc; /* Reuse get_opts decoder */ @@ -198,9 +194,7 @@ rpc_sock_set_default_impl(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); free(impl_name); } SPDK_RPC_REGISTER("sock_set_default_impl", rpc_sock_set_default_impl, SPDK_RPC_STARTUP) diff --git a/lib/trace/trace_rpc.c b/lib/trace/trace_rpc.c index 5cab419fa..9b5ebb41e 100644 --- a/lib/trace/trace_rpc.c +++ b/lib/trace/trace_rpc.c @@ -55,7 +55,6 @@ rpc_trace_enable_tpoint_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_tpoint_group req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_tpoint_group_decoders, SPDK_COUNTOF(rpc_tpoint_group_decoders), &req)) { @@ -74,9 +73,7 @@ rpc_trace_enable_tpoint_group(struct spdk_jsonrpc_request *request, free_rpc_tpoint_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -92,7 +89,6 @@ rpc_trace_disable_tpoint_group(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_tpoint_group req = {}; - struct spdk_json_write_ctx *w; if (spdk_json_decode_object(params, rpc_tpoint_group_decoders, SPDK_COUNTOF(rpc_tpoint_group_decoders), &req)) { @@ -111,9 +107,7 @@ rpc_trace_disable_tpoint_group(struct spdk_jsonrpc_request *request, free_rpc_tpoint_group(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c index 5e8c4be6a..fd8c40f74 100644 --- a/lib/vhost/vhost_rpc.c +++ b/lib/vhost/vhost_rpc.c @@ -66,7 +66,6 @@ rpc_vhost_create_scsi_controller(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_vhost_scsi_ctrlr req = {0}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_vhost_create_scsi_ctrlr, @@ -84,9 +83,7 @@ rpc_vhost_create_scsi_controller(struct spdk_jsonrpc_request *request, free_rpc_vhost_scsi_ctrlr(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -184,11 +181,8 @@ static int rpc_vhost_scsi_controller_remove_target_finish_cb(struct spdk_vhost_dev *vdev, void *arg) { struct spdk_jsonrpc_request *request = arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return 0; } @@ -266,7 +260,6 @@ rpc_vhost_create_blk_controller(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_vhost_blk_ctrlr req = {0}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_construct_vhost_blk_ctrlr, @@ -285,9 +278,7 @@ rpc_vhost_create_blk_controller(struct spdk_jsonrpc_request *request, free_rpc_vhost_blk_ctrlr(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -319,7 +310,6 @@ rpc_vhost_delete_controller(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_delete_vhost_ctrlr req = {0}; - struct spdk_json_write_ctx *w; struct spdk_vhost_dev *vdev; int rc; @@ -346,10 +336,7 @@ rpc_vhost_delete_controller(struct spdk_jsonrpc_request *request, free_rpc_delete_vhost_ctrlr(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); - + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -484,7 +471,6 @@ rpc_vhost_controller_set_coalescing(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_vhost_ctrlr_coalescing req = {0}; - struct spdk_json_write_ctx *w; struct spdk_vhost_dev *vdev; int rc; @@ -511,10 +497,7 @@ rpc_vhost_controller_set_coalescing(struct spdk_jsonrpc_request *request, free_rpc_set_vhost_controllers_event_coalescing(&req); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); - + spdk_jsonrpc_send_bool_response(request, true); return; invalid: diff --git a/module/accel/idxd/accel_engine_idxd_rpc.c b/module/accel/idxd/accel_engine_idxd_rpc.c index c3406c510..48da4729e 100644 --- a/module/accel/idxd/accel_engine_idxd_rpc.c +++ b/module/accel/idxd/accel_engine_idxd_rpc.c @@ -52,7 +52,6 @@ rpc_idxd_scan_accel_engine(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_idxd_scan_accel_engine req = {}; - struct spdk_json_write_ctx *w; if (params != NULL) { if (spdk_json_decode_object(params, rpc_idxd_scan_accel_engine_decoder, @@ -68,8 +67,6 @@ rpc_idxd_scan_accel_engine(struct spdk_jsonrpc_request *request, SPDK_NOTICELOG("Enabling IDXD with config #%u\n", req.config_number); accel_engine_idxd_enable_probe(req.config_number); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("idxd_scan_accel_engine", rpc_idxd_scan_accel_engine, SPDK_RPC_STARTUP) diff --git a/module/accel/ioat/accel_engine_ioat_rpc.c b/module/accel/ioat/accel_engine_ioat_rpc.c index 7f2322536..306ef2d3d 100644 --- a/module/accel/ioat/accel_engine_ioat_rpc.c +++ b/module/accel/ioat/accel_engine_ioat_rpc.c @@ -80,7 +80,6 @@ rpc_ioat_scan_accel_engine(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_ioat_scan_accel_engine req = {}; - struct spdk_json_write_ctx *w; int rc; if (params != NULL) { @@ -107,9 +106,7 @@ rpc_ioat_scan_accel_engine(struct spdk_jsonrpc_request *request, accel_engine_ioat_enable_probe(); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("ioat_scan_accel_engine", rpc_ioat_scan_accel_engine, SPDK_RPC_STARTUP) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(ioat_scan_accel_engine, ioat_scan_copy_engine) diff --git a/module/bdev/aio/bdev_aio_rpc.c b/module/bdev/aio/bdev_aio_rpc.c index a4f6df141..544f29ebe 100644 --- a/module/bdev/aio/bdev_aio_rpc.c +++ b/module/bdev/aio/bdev_aio_rpc.c @@ -108,10 +108,8 @@ static void _rpc_bdev_aio_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c index 19be286fc..99626270b 100644 --- a/module/bdev/compress/vbdev_compress_rpc.c +++ b/module/bdev/compress/vbdev_compress_rpc.c @@ -111,7 +111,6 @@ rpc_bdev_compress_set_pmd(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_compress_set_pmd req; - struct spdk_json_write_ctx *w; int rc = 0; if (spdk_json_decode_object(params, rpc_compress_pmd_decoder, @@ -135,11 +134,7 @@ rpc_bdev_compress_set_pmd(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - if (w != NULL) { - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); - } + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("bdev_compress_set_pmd", rpc_bdev_compress_set_pmd, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) @@ -225,11 +220,8 @@ static void _rpc_bdev_compress_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/crypto/vbdev_crypto_rpc.c b/module/bdev/crypto/vbdev_crypto_rpc.c index 46c1e210d..3ec568a48 100644 --- a/module/bdev/crypto/vbdev_crypto_rpc.c +++ b/module/bdev/crypto/vbdev_crypto_rpc.c @@ -155,10 +155,8 @@ static void rpc_bdev_crypto_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/delay/vbdev_delay_rpc.c b/module/bdev/delay/vbdev_delay_rpc.c index 2a89c027d..93c318f01 100644 --- a/module/bdev/delay/vbdev_delay_rpc.c +++ b/module/bdev/delay/vbdev_delay_rpc.c @@ -63,7 +63,6 @@ rpc_bdev_delay_update_latency(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_update_latency req = {NULL}; - struct spdk_json_write_ctx *w; enum delay_io_type latency_type; int rc = 0; @@ -104,9 +103,7 @@ rpc_bdev_delay_update_latency(struct spdk_jsonrpc_request *request, SPDK_UNREACHABLE(); } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_update_latency(&req); @@ -189,11 +186,8 @@ static void rpc_bdev_delay_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/error/vbdev_error_rpc.c b/module/bdev/error/vbdev_error_rpc.c index 4d9f3a766..457ca2ad4 100644 --- a/module/bdev/error/vbdev_error_rpc.c +++ b/module/bdev/error/vbdev_error_rpc.c @@ -91,7 +91,6 @@ rpc_bdev_error_create(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_error_create req = {}; - struct spdk_json_write_ctx *w; int rc = 0; if (spdk_json_decode_object(params, rpc_bdev_error_create_decoders, @@ -109,9 +108,7 @@ rpc_bdev_error_create(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_error_create(&req); @@ -137,11 +134,8 @@ static void rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void @@ -200,7 +194,6 @@ rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_error_information req = {}; - struct spdk_json_write_ctx *w; uint32_t io_type; uint32_t error_type; int rc = 0; @@ -234,9 +227,7 @@ rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_error_information(&req); diff --git a/module/bdev/ftl/bdev_ftl_rpc.c b/module/bdev/ftl/bdev_ftl_rpc.c index 36e78b934..7abc0fc0a 100644 --- a/module/bdev/ftl/bdev_ftl_rpc.c +++ b/module/bdev/ftl/bdev_ftl_rpc.c @@ -229,10 +229,8 @@ static void rpc_bdev_ftl_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/iscsi/bdev_iscsi_rpc.c b/module/bdev/iscsi/bdev_iscsi_rpc.c index 6e0edc38a..c15d36ec0 100644 --- a/module/bdev/iscsi/bdev_iscsi_rpc.c +++ b/module/bdev/iscsi/bdev_iscsi_rpc.c @@ -122,10 +122,8 @@ static void rpc_bdev_iscsi_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c index 8fdce19f5..ca2478e8f 100644 --- a/module/bdev/lvol/vbdev_lvol_rpc.c +++ b/module/bdev/lvol/vbdev_lvol_rpc.c @@ -183,16 +183,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_rename_lvstore_decode static void rpc_bdev_lvol_rename_lvstore_cb(void *cb_arg, int lvserrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvserrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -251,16 +248,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_delete_lvstore_decode static void rpc_lvol_store_destroy_cb(void *cb_arg, int lvserrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvserrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -579,16 +573,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_rename_decoders[] = { static void rpc_bdev_lvol_rename_cb(void *cb_arg, int lvolerrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvolerrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -655,16 +646,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_inflate_decoders[] = static void rpc_bdev_lvol_inflate_cb(void *cb_arg, int lvolerrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvolerrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -775,16 +763,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_resize_decoders[] = { static void rpc_bdev_lvol_resize_cb(void *cb_arg, int lvolerrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvolerrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -850,16 +835,13 @@ static const struct spdk_json_object_decoder rpc_set_ro_lvol_bdev_decoders[] = { static void rpc_set_ro_lvol_bdev_cb(void *cb_arg, int lvolerrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvolerrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: @@ -931,16 +913,13 @@ static const struct spdk_json_object_decoder rpc_bdev_lvol_delete_decoders[] = { static void rpc_bdev_lvol_delete_cb(void *cb_arg, int lvolerrno) { - struct spdk_json_write_ctx *w; struct spdk_jsonrpc_request *request = cb_arg; if (lvolerrno != 0) { goto invalid; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; invalid: diff --git a/module/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c index c58d384cd..b4fc3c57f 100644 --- a/module/bdev/malloc/bdev_malloc_rpc.c +++ b/module/bdev/malloc/bdev_malloc_rpc.c @@ -131,10 +131,8 @@ static void rpc_bdev_malloc_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c index b8ebbed32..4dd521e14 100644 --- a/module/bdev/null/bdev_null_rpc.c +++ b/module/bdev/null/bdev_null_rpc.c @@ -170,10 +170,8 @@ static void rpc_bdev_null_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/nvme/bdev_nvme_cuse_rpc.c b/module/bdev/nvme/bdev_nvme_cuse_rpc.c index 35abd38af..1f4a6948f 100644 --- a/module/bdev/nvme/bdev_nvme_cuse_rpc.c +++ b/module/bdev/nvme/bdev_nvme_cuse_rpc.c @@ -61,7 +61,6 @@ rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_nvme_cuse_register req = {}; - struct spdk_json_write_ctx *w; struct nvme_bdev_ctrlr *bdev_ctrlr = NULL; int rc; @@ -88,9 +87,7 @@ rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_nvme_cuse_register(&req); @@ -116,7 +113,6 @@ rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_nvme_cuse_unregister req = {}; - struct spdk_json_write_ctx *w; struct nvme_bdev_ctrlr *bdev_ctrlr = NULL; int rc; @@ -142,9 +138,7 @@ rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_nvme_cuse_unregister(&req); diff --git a/module/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c index d2a31aefa..5c8d4f885 100644 --- a/module/bdev/nvme/bdev_nvme_rpc.c +++ b/module/bdev/nvme/bdev_nvme_rpc.c @@ -91,7 +91,6 @@ rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_bdev_nvme_opts opts; - struct spdk_json_write_ctx *w; int rc; bdev_nvme_get_opts(&opts); @@ -110,9 +109,7 @@ rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request, return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); return; } @@ -134,10 +131,8 @@ static void rpc_bdev_nvme_set_hotplug_done(void *ctx) { struct spdk_jsonrpc_request *request = ctx; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void @@ -522,7 +517,6 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request, { struct rpc_bdev_nvme_detach_controller req = {NULL}; struct spdk_nvme_transport_id trid = {}; - struct spdk_json_write_ctx *w; size_t len, maxlen; int rc = 0; bool all_trid_entries, one_trid_entry; @@ -599,9 +593,7 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_nvme_detach_controller(&req); diff --git a/module/bdev/nvme/bdev_ocssd_rpc.c b/module/bdev/nvme/bdev_ocssd_rpc.c index 47c5acdb3..c1d45c374 100644 --- a/module/bdev/nvme/bdev_ocssd_rpc.c +++ b/module/bdev/nvme/bdev_ocssd_rpc.c @@ -155,16 +155,13 @@ static void rpc_bdev_ocssd_delete_done(int status, void *_ctx) { struct rpc_bdev_ocssd_delete_ctx *ctx = _ctx; - struct spdk_json_write_ctx *w; if (status != 0) { spdk_jsonrpc_send_error_response(ctx->request, status, spdk_strerror(-status)); goto out; } - w = spdk_jsonrpc_begin_result(ctx->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(ctx->request, w); + spdk_jsonrpc_send_bool_response(ctx->request, true); out: free_rpc_delete_ocssd_bdev(&ctx->rpc); free(ctx); diff --git a/module/bdev/nvme/vbdev_opal_rpc.c b/module/bdev/nvme/vbdev_opal_rpc.c index ef372cc7f..b400edab3 100644 --- a/module/bdev/nvme/vbdev_opal_rpc.c +++ b/module/bdev/nvme/vbdev_opal_rpc.c @@ -60,7 +60,6 @@ rpc_bdev_nvme_opal_init(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_nvme_opal_init req = {}; - struct spdk_json_write_ctx *w; struct nvme_bdev_ctrlr *nvme_ctrlr; int rc; @@ -107,9 +106,7 @@ rpc_bdev_nvme_opal_init(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free_rpc_bdev_nvme_opal_init(&req); @@ -138,7 +135,6 @@ rpc_bdev_nvme_opal_revert(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_nvme_opal_revert req = {}; - struct spdk_json_write_ctx *w; struct nvme_bdev_ctrlr *nvme_ctrlr; int rc; @@ -167,9 +163,7 @@ rpc_bdev_nvme_opal_revert(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free_rpc_bdev_nvme_opal_revert(&req); @@ -320,7 +314,6 @@ rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_opal_delete req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_bdev_opal_delete_decoders, @@ -337,9 +330,7 @@ rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free_rpc_bdev_opal_delete(&req); } @@ -372,7 +363,6 @@ rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_opal_set_lock_state req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_bdev_opal_set_lock_state_decoders, @@ -389,9 +379,7 @@ rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free_rpc_bdev_opal_set_lock_state(&req); @@ -425,7 +413,6 @@ rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_opal_new_user req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_bdev_opal_new_user_decoders, @@ -443,9 +430,7 @@ rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free_rpc_bdev_opal_new_user(&req); diff --git a/module/bdev/ocf/vbdev_ocf_rpc.c b/module/bdev/ocf/vbdev_ocf_rpc.c index 8cba65093..e801e984c 100644 --- a/module/bdev/ocf/vbdev_ocf_rpc.c +++ b/module/bdev/ocf/vbdev_ocf_rpc.c @@ -125,16 +125,13 @@ static void delete_cb(void *cb_arg, int status) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; if (status) { spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "Could not delete OCF vbdev: %d", status); } else { - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } } diff --git a/module/bdev/passthru/vbdev_passthru_rpc.c b/module/bdev/passthru/vbdev_passthru_rpc.c index eb7b38e33..b5ddbc42e 100644 --- a/module/bdev/passthru/vbdev_passthru_rpc.c +++ b/module/bdev/passthru/vbdev_passthru_rpc.c @@ -111,11 +111,8 @@ static void rpc_bdev_passthru_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/module/bdev/pmem/bdev_pmem_rpc.c b/module/bdev/pmem/bdev_pmem_rpc.c index bfd93e5eb..457ade3e3 100644 --- a/module/bdev/pmem/bdev_pmem_rpc.c +++ b/module/bdev/pmem/bdev_pmem_rpc.c @@ -107,10 +107,8 @@ static void _rpc_bdev_pmem_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void @@ -166,7 +164,6 @@ rpc_bdev_pmem_create_pool(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_pmem_create_pool req = {}; - struct spdk_json_write_ctx *w; uint64_t pool_size; PMEMblkpool *pbp; @@ -205,9 +202,7 @@ rpc_bdev_pmem_create_pool(struct spdk_jsonrpc_request *request, pmemblk_close(pbp); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_pmem_create_pool(&req); @@ -303,7 +298,6 @@ rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_pmem_delete_pool req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_bdev_pmem_delete_pool_decoders, @@ -326,9 +320,7 @@ rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request, unlink(req.pmem_file); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_pmem_delete_pool(&req); diff --git a/module/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c index f65d2b310..3f3459237 100644 --- a/module/bdev/raid/bdev_raid_rpc.c +++ b/module/bdev/raid/bdev_raid_rpc.c @@ -250,7 +250,6 @@ rpc_bdev_raid_create(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_bdev_raid_create req = {}; - struct spdk_json_write_ctx *w; struct raid_bdev_config *raid_cfg; int rc; size_t i; @@ -314,9 +313,7 @@ rpc_bdev_raid_create(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_raid_create(&req); @@ -373,7 +370,6 @@ bdev_raid_delete_done(void *cb_arg, int rc) struct rpc_bdev_raid_delete_ctx *ctx = cb_arg; struct raid_bdev_config *raid_cfg; struct spdk_jsonrpc_request *request = ctx->request; - struct spdk_json_write_ctx *w; if (rc != 0) { SPDK_ERRLOG("Failed to delete raid bdev %s (%d): %s\n", @@ -388,9 +384,7 @@ bdev_raid_delete_done(void *cb_arg, int rc) raid_bdev_config_cleanup(raid_cfg); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); exit: free_rpc_bdev_raid_delete(&ctx->req); free(ctx); diff --git a/module/bdev/rbd/bdev_rbd_rpc.c b/module/bdev/rbd/bdev_rbd_rpc.c index 026869f64..ea2a7f463 100644 --- a/module/bdev/rbd/bdev_rbd_rpc.c +++ b/module/bdev/rbd/bdev_rbd_rpc.c @@ -162,11 +162,8 @@ static void _rpc_bdev_rbd_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void @@ -220,7 +217,6 @@ rpc_bdev_rbd_resize(struct spdk_jsonrpc_request *request, { struct rpc_bdev_rbd_resize req = {}; struct spdk_bdev *bdev; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_bdev_rbd_resize_decoders, @@ -243,9 +239,7 @@ rpc_bdev_rbd_resize(struct spdk_jsonrpc_request *request, goto cleanup; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); cleanup: free_rpc_bdev_rbd_resize(&req); } diff --git a/module/bdev/split/vbdev_split_rpc.c b/module/bdev/split/vbdev_split_rpc.c index a222236c1..98477be69 100644 --- a/module/bdev/split/vbdev_split_rpc.c +++ b/module/bdev/split/vbdev_split_rpc.c @@ -118,7 +118,6 @@ rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_delete_split req = {}; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_delete_split_decoders, @@ -135,9 +134,7 @@ rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, goto out; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); out: free(req.base_bdev); } diff --git a/module/bdev/uring/bdev_uring_rpc.c b/module/bdev/uring/bdev_uring_rpc.c index 3bb2beb42..4e772db0c 100644 --- a/module/bdev/uring/bdev_uring_rpc.c +++ b/module/bdev/uring/bdev_uring_rpc.c @@ -114,10 +114,8 @@ static void _rpc_bdev_uring_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } diff --git a/module/bdev/virtio/bdev_virtio_rpc.c b/module/bdev/virtio/bdev_virtio_rpc.c index 43a8b1edc..aee89f010 100644 --- a/module/bdev/virtio/bdev_virtio_rpc.c +++ b/module/bdev/virtio/bdev_virtio_rpc.c @@ -55,7 +55,6 @@ static void rpc_bdev_virtio_detach_controller_cb(void *ctx, int errnum) { struct spdk_jsonrpc_request *request = ctx; - struct spdk_json_write_ctx *w; if (errnum != 0) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, @@ -63,9 +62,7 @@ rpc_bdev_virtio_detach_controller_cb(void *ctx, int errnum) return; } - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } static void diff --git a/module/bdev/zone_block/vbdev_zone_block_rpc.c b/module/bdev/zone_block/vbdev_zone_block_rpc.c index d34d0bc54..c1a5dd96a 100644 --- a/module/bdev/zone_block/vbdev_zone_block_rpc.c +++ b/module/bdev/zone_block/vbdev_zone_block_rpc.c @@ -116,11 +116,8 @@ static void _rpc_delete_zone_block_cb(void *cb_ctx, int rc) { struct spdk_jsonrpc_request *request = cb_ctx; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, rc == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, rc == 0); } static void diff --git a/module/blobfs/bdev/blobfs_bdev_rpc.c b/module/blobfs/bdev/blobfs_bdev_rpc.c index a3da7432d..d0f61e5a8 100644 --- a/module/blobfs/bdev/blobfs_bdev_rpc.c +++ b/module/blobfs/bdev/blobfs_bdev_rpc.c @@ -61,7 +61,6 @@ rpc_blobfs_set_cache_size(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_blobfs_set_cache_size req; - struct spdk_json_write_ctx *w; int rc; if (spdk_json_decode_object(params, rpc_blobfs_set_cache_size_decoders, @@ -83,9 +82,7 @@ rpc_blobfs_set_cache_size(struct spdk_jsonrpc_request *request, rc = spdk_fs_set_cache_size(req.size_in_mb); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, rc == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, rc == 0); } SPDK_RPC_REGISTER("blobfs_set_cache_size", rpc_blobfs_set_cache_size, @@ -112,7 +109,6 @@ static void _rpc_blobfs_detect_done(void *cb_arg, int fserrno) { struct rpc_blobfs_detect *req = cb_arg; - struct spdk_json_write_ctx *w; bool existed = true; if (fserrno == -EILSEQ) { @@ -125,9 +121,7 @@ _rpc_blobfs_detect_done(void *cb_arg, int fserrno) return; } - w = spdk_jsonrpc_begin_result(req->request); - spdk_json_write_bool(w, existed); - spdk_jsonrpc_end_result(req->request, w); + spdk_jsonrpc_send_bool_response(req->request, existed); free_rpc_blobfs_detect(req); } @@ -212,7 +206,6 @@ static void _rpc_blobfs_create_done(void *cb_arg, int fserrno) { struct rpc_blobfs_create *req = cb_arg; - struct spdk_json_write_ctx *w; if (fserrno != 0) { spdk_jsonrpc_send_error_response(req->request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, @@ -221,9 +214,7 @@ _rpc_blobfs_create_done(void *cb_arg, int fserrno) return; } - w = spdk_jsonrpc_begin_result(req->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(req->request, w); + spdk_jsonrpc_send_bool_response(req->request, true); free_rpc_blobfs_create(req); } @@ -286,7 +277,6 @@ static void _rpc_blobfs_mount_done(void *cb_arg, int fserrno) { struct rpc_blobfs_mount *req = cb_arg; - struct spdk_json_write_ctx *w; if (fserrno == -EILSEQ) { /* There is no blobfs existing on bdev */ @@ -301,9 +291,7 @@ _rpc_blobfs_mount_done(void *cb_arg, int fserrno) return; } - w = spdk_jsonrpc_begin_result(req->request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(req->request, w); + spdk_jsonrpc_send_bool_response(req->request, true); free_rpc_blobfs_mount(req); } diff --git a/module/event/subsystems/nvmf/nvmf_rpc.c b/module/event/subsystems/nvmf/nvmf_rpc.c index e1857a260..87c11e393 100644 --- a/module/event/subsystems/nvmf/nvmf_rpc.c +++ b/module/event/subsystems/nvmf/nvmf_rpc.c @@ -44,7 +44,6 @@ static void rpc_nvmf_set_max_subsystems(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct spdk_json_write_ctx *w; uint32_t max_subsystems = 0; if (g_spdk_nvmf_tgt_max_subsystems != 0) { @@ -66,9 +65,7 @@ rpc_nvmf_set_max_subsystems(struct spdk_jsonrpc_request *request, g_spdk_nvmf_tgt_max_subsystems = max_subsystems; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("nvmf_set_max_subsystems", rpc_nvmf_set_max_subsystems, SPDK_RPC_STARTUP) @@ -112,7 +109,6 @@ rpc_nvmf_set_config(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_nvmf_tgt_conf conf; - struct spdk_json_write_ctx *w; memcpy(&conf, &g_spdk_nvmf_tgt_conf, sizeof(conf)); @@ -128,9 +124,7 @@ rpc_nvmf_set_config(struct spdk_jsonrpc_request *request, memcpy(&g_spdk_nvmf_tgt_conf, &conf, sizeof(conf)); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("nvmf_set_config", rpc_nvmf_set_config, SPDK_RPC_STARTUP) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_set_config, set_nvmf_target_config) diff --git a/module/event/subsystems/vmd/vmd_rpc.c b/module/event/subsystems/vmd/vmd_rpc.c index eb01be143..a68fdefd4 100644 --- a/module/event/subsystems/vmd/vmd_rpc.c +++ b/module/event/subsystems/vmd/vmd_rpc.c @@ -42,14 +42,11 @@ static void rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct spdk_json_write_ctx *w; int rc; rc = vmd_subsystem_init(); - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, rc == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, rc == 0); } SPDK_RPC_REGISTER("enable_vmd", rpc_vmd_enable, SPDK_RPC_STARTUP) diff --git a/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c b/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c index b60e3f097..ecb60963b 100644 --- a/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c +++ b/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c @@ -59,7 +59,6 @@ static void spdk_rpc_fuzz_vhost_create_dev(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct spdk_json_write_ctx *w; struct rpc_fuzz_vhost_dev_create req = {0}; int rc; @@ -97,9 +96,7 @@ spdk_rpc_fuzz_vhost_create_dev(struct spdk_jsonrpc_request *request, "Unexpected error code.\n"); } } else { - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, true); } free(req.socket); diff --git a/test/external_code/passthru/vbdev_passthru_rpc.c b/test/external_code/passthru/vbdev_passthru_rpc.c index 00b85a83b..0b0409f1a 100644 --- a/test/external_code/passthru/vbdev_passthru_rpc.c +++ b/test/external_code/passthru/vbdev_passthru_rpc.c @@ -110,11 +110,8 @@ static void rpc_bdev_passthru_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; - struct spdk_json_write_ctx *w; - w = spdk_jsonrpc_begin_result(request); - spdk_json_write_bool(w, bdeverrno == 0); - spdk_jsonrpc_end_result(request, w); + spdk_jsonrpc_send_bool_response(request, bdeverrno == 0); } static void diff --git a/test/rpc_client/rpc_client_test.c b/test/rpc_client/rpc_client_test.c index 4b421f7bb..66d2f303e 100644 --- a/test/rpc_client/rpc_client_test.c +++ b/test/rpc_client/rpc_client_test.c @@ -216,17 +216,13 @@ static void rpc_test_method_null_params(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { - struct spdk_json_write_ctx *w; - if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "rpc_test_method_null_params(): Parameters are not NULL"); return; } - w = spdk_jsonrpc_begin_result(request); - assert(w != NULL); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); + + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("test_null_params", rpc_test_method_null_params, SPDK_RPC_RUNTIME) @@ -243,7 +239,6 @@ static void rpc_hook_conn_close(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_jsonrpc_server_conn *conn = spdk_jsonrpc_get_conn(request); - struct spdk_json_write_ctx *w; int rc; rc = spdk_jsonrpc_conn_add_close_cb(conn, rpc_test_conn_close_cb, (void *)(intptr_t)(42)); @@ -267,11 +262,7 @@ rpc_hook_conn_close(struct spdk_jsonrpc_request *request, const struct spdk_json return; } - w = spdk_jsonrpc_begin_result(request); - assert(w != NULL); - spdk_json_write_bool(w, true); - spdk_jsonrpc_end_result(request, w); - + spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("hook_conn_close", rpc_hook_conn_close, SPDK_RPC_RUNTIME | SPDK_RPC_STARTUP) diff --git a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c index e5472a756..535acd29d 100644 --- a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c +++ b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c @@ -116,6 +116,8 @@ DEFINE_STUB_V(spdk_rpc_register_method, (const char *method, spdk_rpc_method_han DEFINE_STUB_V(spdk_rpc_register_alias_deprecated, (const char *method, const char *alias)); DEFINE_STUB_V(spdk_jsonrpc_end_result, (struct spdk_jsonrpc_request *request, struct spdk_json_write_ctx *w)); +DEFINE_STUB_V(spdk_jsonrpc_send_bool_response, (struct spdk_jsonrpc_request *request, + bool value)); DEFINE_STUB(spdk_json_decode_string, int, (const struct spdk_json_val *val, void *out), 0); DEFINE_STUB(spdk_json_decode_uint32, int, (const struct spdk_json_val *val, void *out), 0); DEFINE_STUB(spdk_json_decode_array, int, (const struct spdk_json_val *values, diff --git a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c index 28ceca2e4..a98a742ed 100644 --- a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c +++ b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c @@ -84,6 +84,8 @@ DEFINE_STUB_V(spdk_rpc_register_method, (const char *method, spdk_rpc_method_han uint32_t state_mask)); DEFINE_STUB_V(spdk_jsonrpc_end_result, (struct spdk_jsonrpc_request *request, struct spdk_json_write_ctx *w)); +DEFINE_STUB_V(spdk_jsonrpc_send_bool_response, (struct spdk_jsonrpc_request *request, + bool value)); DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *, (struct spdk_bdev_desc *desc), (void *)0);