Commit c77bc554 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

module/bdev: Use error_response() rather than bool_response(false) for JSON RPCs 



For JSON RPC, boolean response with false value may not be regarded as error.
Previously many cases were replaced to use
spdk_jsonrpc_send_error_response() explicitly. However, this pattern did
not become established and new bdev modules used
spdk_jsonrpc_send_bool_response() with false.

Once again, replace remaining cases in this patch.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ie8858bc8ff7c36bc3a829977044a91d459db76f2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16555


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5feab0dd

module/bdev/compress/vbdev_compress_rpc.c

+6 −1
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (C) 2018 Intel Corporation.

 *   Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *   All rights reserved.

 */
@@ -153,7 +154,11 @@ _rpc_bdev_compress_delete_cb(void *cb_arg, int bdeverrno) 
{

	struct spdk_jsonrpc_request *request = cb_arg;



	spdk_jsonrpc_send_bool_response(request, bdeverrno == 0);

	if (bdeverrno == 0) {

		spdk_jsonrpc_send_bool_response(request, true);

	} else {

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

	}

}



static void

module/bdev/daos/bdev_daos_rpc.c

+6 −1
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (c) croit GmbH.

 *   Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *   All rights reserved.

 */
@@ -108,7 +109,11 @@ rpc_bdev_daos_delete_cb(void *cb_arg, int bdeverrno) 
{

	struct spdk_jsonrpc_request *request = cb_arg;



	spdk_jsonrpc_send_bool_response(request, bdeverrno == 0);

	if (bdeverrno == 0) {

		spdk_jsonrpc_send_bool_response(request, true);

	} else {

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

	}

}



static void

module/bdev/ftl/bdev_ftl_rpc.c

+13 −4
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (C) 2020 Intel Corporation.

 *   Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *   All rights reserved.

 */
@@ -142,7 +143,11 @@ rpc_bdev_ftl_delete_cb(void *cb_arg, int bdeverrno) 
{

	struct spdk_jsonrpc_request *request = cb_arg;



	spdk_jsonrpc_send_bool_response(request, bdeverrno == 0);

	if (bdeverrno == 0) {

		spdk_jsonrpc_send_bool_response(request, true);

	} else {

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

	}

}



static void
@@ -190,7 +195,11 @@ rpc_bdev_ftl_unmap_cb(void *cb_arg, int bdeverrno) 
{

	struct spdk_jsonrpc_request *request = cb_arg;



	spdk_jsonrpc_send_bool_response(request, bdeverrno == 0);

	if (bdeverrno == 0) {

		spdk_jsonrpc_send_bool_response(request, true);

	} else {

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

	}

}



static void
@@ -300,14 +309,14 @@ rpc_bdev_ftl_get_stats(struct spdk_jsonrpc_request *request, 


	stats = calloc(1, sizeof(struct ftl_stats));

	if (!stats) {

		spdk_jsonrpc_send_bool_response(request, false);

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

		goto invalid;

	}



	rc = bdev_ftl_get_stats(attrs.name, _rpc_bdev_ftl_get_stats, request, stats);

	if (rc) {

		free(stats);

		spdk_jsonrpc_send_bool_response(request, false);

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

		goto invalid;

	}

module/bdev/nvme/bdev_nvme_rpc.c

+6 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,12 @@ _rpc_bdev_nvme_reset_controller_cb(void *_ctx) 
{

	struct rpc_bdev_nvme_reset_controller_ctx *ctx = _ctx;



	spdk_jsonrpc_send_bool_response(ctx->request, ctx->success);

	if (ctx->success) {

		spdk_jsonrpc_send_bool_response(ctx->request, true);

	} else {

		spdk_jsonrpc_send_error_response(ctx->request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "Controller reset failed");

	}



	free(ctx);

}

module/bdev/passthru/vbdev_passthru_rpc.c

+1 −0
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (C) 2018 Intel Corporation.

 *   Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *   All rights reserved.

 */