Commit de1d0f8f authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Darek Stojaczyk
Browse files

jsonrpc: don't check returned value from spdk_jsonrpc_begin_result() 



As spdk_jsonrpc_begin_result() is not allowed to return NULL we can
remove these checks. We didn't have any tests cases that goes this path
anyway.

Change-Id: I0894e76c0162591e550e70b172566b9060a6dd5f
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459199


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 37acf681

lib/bdev/aio/bdev_aio_rpc.c

+1 −10
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ spdk_rpc_construct_aio_bdev(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);
@@ -111,12 +107,7 @@ static void 
_spdk_rpc_delete_aio_bdev_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);

	if (w == NULL) {

		return;

	}

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

lib/bdev/crypto/vbdev_crypto_rpc.c

+1 −11
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ spdk_rpc_construct_crypto_bdev(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		free_rpc_construct_crypto(&req);

		return;

	}



	spdk_json_write_string(w, req.name);

	spdk_jsonrpc_end_result(request, w);

	free_rpc_construct_crypto(&req);
@@ -120,12 +115,7 @@ static void 
_spdk_rpc_delete_crypto_bdev_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);

	if (w == NULL) {

		return;

	}

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

lib/bdev/error/vbdev_error_rpc.c

+0 −12
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ spdk_rpc_construct_error_bdev(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		goto cleanup;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);
@@ -143,10 +139,6 @@ _spdk_rpc_delete_error_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);

}
@@ -241,10 +233,6 @@ spdk_rpc_bdev_inject_error(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		goto cleanup;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

lib/bdev/iscsi/bdev_iscsi_rpc.c

+1 −10
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ construct_iscsi_bdev_cb(void *cb_arg, struct spdk_bdev *bdev, int status) 
						 spdk_strerror(-status));

	} else {

		w = spdk_jsonrpc_begin_result(request);

		if (w == NULL) {

			return;

		}



		spdk_json_write_string(w, spdk_bdev_get_name(bdev));

		spdk_jsonrpc_end_result(request, w);

	}
@@ -125,12 +121,7 @@ static void 
_spdk_rpc_delete_iscsi_bdev_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);

	if (w == NULL) {

		return;

	}

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

lib/bdev/lvol/vbdev_lvol_rpc.c

+0 −49
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ _spdk_rpc_lvol_store_construct_cb(void *cb_arg, struct spdk_lvol_store *lvol_sto 
	spdk_uuid_fmt_lower(lvol_store_uuid, sizeof(lvol_store_uuid), &lvol_store->uuid);



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_string(w, lvol_store_uuid);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -202,10 +198,6 @@ _spdk_rpc_rename_lvol_store_cb(void *cb_arg, int lvserrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -273,10 +265,6 @@ _spdk_rpc_lvol_store_destroy_cb(void *cb_arg, int lvserrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -354,10 +342,6 @@ _spdk_rpc_construct_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvole 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_string(w, lvol->unique_id);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -449,10 +433,6 @@ _spdk_rpc_snapshot_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvoler 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_string(w, lvol->unique_id);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -531,10 +511,6 @@ _spdk_rpc_clone_lvol_bdev_cb(void *cb_arg, struct spdk_lvol *lvol, int lvolerrno 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_string(w, lvol->unique_id);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -613,10 +589,6 @@ _spdk_rpc_rename_lvol_bdev_cb(void *cb_arg, int lvolerrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -692,10 +664,6 @@ _spdk_rpc_inflate_lvol_bdev_cb(void *cb_arg, int lvolerrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -814,10 +782,6 @@ _spdk_rpc_resize_lvol_bdev_cb(void *cb_arg, int lvolerrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -892,10 +856,6 @@ _spdk_rpc_set_ro_lvol_bdev_cb(void *cb_arg, int lvolerrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -976,10 +936,6 @@ _spdk_rpc_destroy_lvol_bdev_cb(void *cb_arg, int lvolerrno) 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;
@@ -1110,11 +1066,6 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		free_rpc_get_lvol_stores(&req);

		return;

	}



	spdk_json_write_array_begin(w);



	if (lvs_bdev != NULL) {