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

Remove remaining spdk_jsonrpc_begin_result() NULL checks

Browse Source 
After recent changes, that function can not return
NULL anymore, so remove all redundant checks from
various SPDK libraries.

Change-Id: If80344b6fa81ad5f87a7086804dba221522cd7e2
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464175
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-08-05 15:46:09 +02:00 committed by Ben Walker
parent 4a713238b7
commit 3d23defba4
11 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bdev/compress/vbdev_compress_rpc.c
View File

@ -131,11 +131,6 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request,
}
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
free_rpc_construct_compress(&req);
return;
}
name = spdk_sprintf_alloc("COMP_%s", req.base_bdev_name);
spdk_json_write_string(w, name);
spdk_jsonrpc_end_result(request, w);
@ -167,10 +162,6 @@ _spdk_rpc_delete_compress_bdev_cb(void *cb_arg, int bdeverrno)
struct spdk_json_write_ctx *w;
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_bool(w, bdeverrno == 0);
spdk_jsonrpc_end_result(request, w);
}

8
lib/bdev/delay/vbdev_delay_rpc.c
View File

@ -88,10 +88,6 @@ spdk_rpc_bdev_delay_create(struct spdk_jsonrpc_request *request,
}
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
goto cleanup;
}
spdk_json_write_string(w, req.name);
spdk_jsonrpc_end_result(request, w);
@ -121,10 +117,6 @@ _spdk_rpc_bdev_delay_delete_cb(void *cb_arg, int bdeverrno)
struct spdk_json_write_ctx *w;
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_bool(w, bdeverrno == 0);
spdk_jsonrpc_end_result(request, w);
}

4
lib/event/rpc/app_rpc.c
View File

@ -202,10 +202,6 @@ spdk_rpc_thread_get_stats(struct spdk_jsonrpc_request *request,
ctx->request = request;
ctx->w = spdk_jsonrpc_begin_result(ctx->request);
if (NULL == ctx->w) {
free(ctx);
return;
}
spdk_json_write_object_begin(ctx->w);
spdk_json_write_named_uint64(ctx->w, "tick_rate", spdk_get_ticks_hz());
spdk_json_write_named_array_begin(ctx->w, "threads");

7
lib/event/rpc/notify_rpc.c
View File

@ -60,10 +60,6 @@ spdk_rpc_get_notification_types(struct spdk_jsonrpc_request *request,
}
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_array_begin(w);
spdk_notify_foreach_type(get_notification_types_cb, w);
spdk_json_write_array_end(w);
@ -116,9 +112,6 @@ spdk_rpc_get_notifications(struct spdk_jsonrpc_request *request,
req.w = spdk_jsonrpc_begin_result(request);
if (req.w == NULL) {
return;
}
spdk_json_write_array_begin(req.w);
spdk_notify_foreach_event(req.id, req.max, get_notifications_cb, &req);

4
lib/event/subsystems/vmd/vmd_rpc.c
View File

@ -47,10 +47,6 @@ spdk_rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json
rc = spdk_vmd_init();
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_bool(w, rc == 0);
spdk_jsonrpc_end_result(request, w);
}

6
lib/iscsi/iscsi_rpc.c
View File

@ -635,13 +635,9 @@ rpc_delete_target_node_done(void *cb_arg, int rc)
free_rpc_delete_target_node(&ctx->req);
w = spdk_jsonrpc_begin_result(ctx->request);
if (w == NULL) {
goto exit;
}
spdk_json_write_bool(w, rc == 0);
spdk_jsonrpc_end_result(ctx->request, w);
exit:
free(ctx);
}

9
lib/rpc/rpc.c
View File

@ -391,26 +391,17 @@ spdk_rpc_get_spdk_version(struct spdk_jsonrpc_request *request, const struct spd
}
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_object_begin(w);
spdk_json_write_named_string_fmt(w, "version", "%s", SPDK_VERSION_STRING);
spdk_json_write_named_object_begin(w, "fields");
spdk_json_write_named_uint32(w, "major", SPDK_VERSION_MAJOR);
spdk_json_write_named_uint32(w, "minor", SPDK_VERSION_MINOR);
spdk_json_write_named_uint32(w, "patch", SPDK_VERSION_PATCH);
spdk_json_write_named_string_fmt(w, "suffix", "%s", SPDK_VERSION_SUFFIX);
spdk_json_write_object_end(w);
spdk_json_write_object_end(w);
spdk_jsonrpc_end_result(request, w);
}
SPDK_RPC_REGISTER("get_spdk_version", spdk_rpc_get_spdk_version,

4
lib/vhost/vhost_rpc.c
View File

@ -428,10 +428,6 @@ spdk_rpc_get_vhost_controllers(struct spdk_jsonrpc_request *request,
free_rpc_get_vhost_ctrlrs(&req);
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
spdk_vhost_unlock();
return;
}
spdk_json_write_array_begin(w);
vdev = spdk_vhost_dev_next(NULL);

6
test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c
View File

@ -98,12 +98,6 @@ spdk_rpc_fuzz_vhost_create_dev(struct spdk_jsonrpc_request *request,
}
} else {
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
fprintf(stderr, "Unable to allocate an rpc response.\n");
free(req.socket);
return;
}
spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w);
}

3
test/bdev/bdevio/bdevio.c
View File

@ -1189,9 +1189,6 @@ rpc_perform_tests_cb(unsigned num_failures, struct spdk_jsonrpc_request *request
if (num_failures == 0) {
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_uint32(w, num_failures);
spdk_jsonrpc_end_result(request, w);
} else {

3
test/bdev/bdevperf/bdevperf.c
View File

@ -1321,9 +1321,6 @@ rpc_perform_tests_cb(int rc)
if (rc == 0) {
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_uint32(w, rc);
spdk_jsonrpc_end_result(request, w);
} else {