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

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

Browse Source 
Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Iba2091f67a97a59ecad7f0c853491d9cfcad736d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17649
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
This commit is contained in:
Shuhei Matsumoto 2023-04-20 11:22:25 +09:00 committed by Konrad Sztyber
parent 0ca5304550
commit d33d418742
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/bdev/nvme/bdev_nvme_rpc.c
View File

@ -269,6 +269,13 @@ struct rpc_bdev_nvme_attach_controller_ctx {
struct spdk_jsonrpc_request *request; 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 static void
rpc_bdev_nvme_attach_controller_examined(void *cb_ctx) 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_json_write_array_end(w);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
free_rpc_bdev_nvme_attach_controller(&ctx->req); free_rpc_bdev_nvme_attach_controller_ctx(ctx);
free(ctx);
} }
static void static void
@ -297,8 +303,7 @@ rpc_bdev_nvme_attach_controller_done(void *cb_ctx, size_t bdev_count, int rc)
if (rc < 0) { if (rc < 0) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
free_rpc_bdev_nvme_attach_controller(&ctx->req); free_rpc_bdev_nvme_attach_controller_ctx(ctx);
free(ctx);
return; return;
} }
@ -519,8 +524,7 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,
return; return;
cleanup: cleanup:
free_rpc_bdev_nvme_attach_controller(&ctx->req); free_rpc_bdev_nvme_attach_controller_ctx(ctx);
free(ctx);
} }
SPDK_RPC_REGISTER("bdev_nvme_attach_controller", rpc_bdev_nvme_attach_controller, SPDK_RPC_REGISTER("bdev_nvme_attach_controller", rpc_bdev_nvme_attach_controller,
SPDK_RPC_RUNTIME) SPDK_RPC_RUNTIME)