From 6d442665fdd158d5118c1e21ce582f5526c98223 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 16 Jul 2019 13:34:48 +0200 Subject: [PATCH] bdev/rpc: remove if checks for obligatory rpc arguments These arguments are obligatory and spdk_json_decode_object will fail even before we reach the if block. Change-Id: I3c17faf570aefc7d96d009a595cf3a76994977e7 Signed-off-by: Karol Latecki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/462043 Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- lib/bdev/rpc/bdev_rpc.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/bdev/rpc/bdev_rpc.c b/lib/bdev/rpc/bdev_rpc.c index 6f003178a..34371b2f0 100644 --- a/lib/bdev/rpc/bdev_rpc.c +++ b/lib/bdev/rpc/bdev_rpc.c @@ -390,8 +390,6 @@ spdk_rpc_set_bdev_qd_sampling_period(struct spdk_jsonrpc_request *request, struct spdk_bdev *bdev; struct spdk_json_write_ctx *w; - req.period = UINT64_MAX; - if (spdk_json_decode_object(params, rpc_set_bdev_qd_sampling_period_decoders, SPDK_COUNTOF(rpc_set_bdev_qd_sampling_period_decoders), &req)) { @@ -399,21 +397,12 @@ spdk_rpc_set_bdev_qd_sampling_period(struct spdk_jsonrpc_request *request, goto invalid; } - if (req.name) { - bdev = spdk_bdev_get_by_name(req.name); - if (bdev == NULL) { - SPDK_ERRLOG("bdev '%s' does not exist\n", req.name); - goto invalid; - } - } else { - SPDK_ERRLOG("Missing name param\n"); + bdev = spdk_bdev_get_by_name(req.name); + if (bdev == NULL) { + SPDK_ERRLOG("bdev '%s' does not exist\n", req.name); goto invalid; } - if (req.period == UINT64_MAX) { - SPDK_ERRLOG("Missing period param"); - } - w = spdk_jsonrpc_begin_result(request); spdk_bdev_set_qd_sampling_period(bdev, req.period);