Commit d33d4187 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

bdev/nvme: Aggregate req and ctx free for attach_controller RPC 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 0ca53045

module/bdev/nvme/bdev_nvme_rpc.c

+10 −6
Original line number Diff line number Diff line
@@ -269,6 +269,13 @@ struct rpc_bdev_nvme_attach_controller_ctx { 
	struct spdk_jsonrpc_request *request;

};



static void

free_rpc_bdev_nvme_attach_controller_ctx(struct rpc_bdev_nvme_attach_controller_ctx *ctx)

{

	free_rpc_bdev_nvme_attach_controller(&ctx->req);

	free(ctx);

}



static void

rpc_bdev_nvme_attach_controller_examined(void *cb_ctx)

{
@@ -285,8 +292,7 @@ rpc_bdev_nvme_attach_controller_examined(void *cb_ctx) 
	spdk_json_write_array_end(w);

	spdk_jsonrpc_end_result(request, w);



	free_rpc_bdev_nvme_attach_controller(&ctx->req);

	free(ctx);

	free_rpc_bdev_nvme_attach_controller_ctx(ctx);

}



static void
@@ -297,8 +303,7 @@ rpc_bdev_nvme_attach_controller_done(void *cb_ctx, size_t bdev_count, int rc) 


	if (rc < 0) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

		free_rpc_bdev_nvme_attach_controller(&ctx->req);

		free(ctx);

		free_rpc_bdev_nvme_attach_controller_ctx(ctx);

		return;

	}
@@ -519,8 +524,7 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 
	return;



cleanup:

	free_rpc_bdev_nvme_attach_controller(&ctx->req);

	free(ctx);

	free_rpc_bdev_nvme_attach_controller_ctx(ctx);

}

SPDK_RPC_REGISTER("bdev_nvme_attach_controller", rpc_bdev_nvme_attach_controller,

		  SPDK_RPC_RUNTIME)