From 9d94e1f53e6e45d1302a50f8f7c1e4418b2ffcec Mon Sep 17 00:00:00 2001 From: Artur Paszkiewicz Date: Wed, 13 Nov 2019 10:50:00 +0100 Subject: [PATCH] module/raid: don't declare variable inside 'for' statement Fix all occurances in raid source files. Signed-off-by: Artur Paszkiewicz Change-Id: I1862b703e213ca133fb81e46dd9502b0b9d32d9f Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/474071 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- module/bdev/raid/bdev_raid.c | 19 +++++++++++++------ module/bdev/raid/bdev_raid_rpc.c | 7 +++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/module/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c index b79d7bed6f..c6c8911d6e 100644 --- a/module/bdev/raid/bdev_raid.c +++ b/module/bdev/raid/bdev_raid.c @@ -115,6 +115,7 @@ raid_bdev_create_cb(void *io_device, void *ctx_buf) { struct raid_bdev *raid_bdev = io_device; struct raid_bdev_io_channel *raid_ch = ctx_buf; + uint8_t i; SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_create_cb, %p\n", raid_ch); @@ -129,7 +130,7 @@ raid_bdev_create_cb(void *io_device, void *ctx_buf) SPDK_ERRLOG("Unable to allocate base bdevs io channel\n"); return -ENOMEM; } - for (uint8_t i = 0; i < raid_ch->num_channels; i++) { + for (i = 0; i < raid_ch->num_channels; i++) { /* * Get the spdk_io_channel for all the base bdevs. This is used during * split logic to send the respective child bdev ios to respective base @@ -138,7 +139,9 @@ raid_bdev_create_cb(void *io_device, void *ctx_buf) raid_ch->base_channel[i] = spdk_bdev_get_io_channel( raid_bdev->base_bdev_info[i].desc); if (!raid_ch->base_channel[i]) { - for (uint8_t j = 0; j < i; j++) { + uint8_t j; + + for (j = 0; j < i; j++) { spdk_put_io_channel(raid_ch->base_channel[j]); } free(raid_ch->base_channel); @@ -165,12 +168,13 @@ static void raid_bdev_destroy_cb(void *io_device, void *ctx_buf) { struct raid_bdev_io_channel *raid_ch = ctx_buf; + uint8_t i; SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_destroy_cb\n"); assert(raid_ch != NULL); assert(raid_ch->base_channel); - for (uint8_t i = 0; i < raid_ch->num_channels; i++) { + for (i = 0; i < raid_ch->num_channels; i++) { /* Free base bdev channels */ assert(raid_ch->base_channel[i] != NULL); spdk_put_io_channel(raid_ch->base_channel[i]); @@ -249,11 +253,12 @@ static int raid_bdev_destruct(void *ctxt) { struct raid_bdev *raid_bdev = ctxt; + uint8_t i; SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_destruct\n"); raid_bdev->destruct_called = true; - for (uint8_t i = 0; i < raid_bdev->num_base_bdevs; i++) { + for (i = 0; i < raid_bdev->num_base_bdevs; i++) { /* * Close all base bdev descriptors for which call has come from below * layers. Also close the descriptors if we have started shutdown. @@ -561,6 +566,7 @@ static int raid_bdev_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) { struct raid_bdev *raid_bdev = ctx; + uint8_t i; SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_dump_config_json\n"); assert(raid_bdev != NULL); @@ -576,7 +582,7 @@ raid_bdev_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) spdk_json_write_named_uint32(w, "num_base_bdevs_discovered", raid_bdev->num_base_bdevs_discovered); spdk_json_write_name(w, "base_bdevs_list"); spdk_json_write_array_begin(w); - for (uint8_t i = 0; i < raid_bdev->num_base_bdevs; i++) { + for (i = 0; i < raid_bdev->num_base_bdevs; i++) { if (raid_bdev->base_bdev_info[i].bdev) { spdk_json_write_string(w, raid_bdev->base_bdev_info[i].bdev->name); } else { @@ -1298,13 +1304,14 @@ raid_bdev_configure(struct raid_bdev *raid_bdev) uint64_t min_blockcnt; struct spdk_bdev *raid_bdev_gen; int rc = 0; + uint8_t i; assert(raid_bdev->state == RAID_BDEV_STATE_CONFIGURING); assert(raid_bdev->num_base_bdevs_discovered == raid_bdev->num_base_bdevs); blocklen = raid_bdev->base_bdev_info[0].bdev->blocklen; min_blockcnt = raid_bdev->base_bdev_info[0].bdev->blockcnt; - for (uint8_t i = 1; i < raid_bdev->num_base_bdevs; i++) { + for (i = 1; i < raid_bdev->num_base_bdevs; i++) { /* Calculate minimum block count from all base bdevs */ if (raid_bdev->base_bdev_info[i].bdev->blockcnt < min_blockcnt) { min_blockcnt = raid_bdev->base_bdev_info[i].bdev->blockcnt; diff --git a/module/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c index 06d24dac14..4d8f936776 100644 --- a/module/bdev/raid/bdev_raid_rpc.c +++ b/module/bdev/raid/bdev_raid_rpc.c @@ -182,8 +182,10 @@ struct rpc_bdev_raid_create { static void free_rpc_bdev_raid_create(struct rpc_bdev_raid_create *req) { + size_t i; + free(req->name); - for (size_t i = 0; i < req->base_bdevs.num_base_bdevs; i++) { + for (i = 0; i < req->base_bdevs.num_base_bdevs; i++) { free(req->base_bdevs.base_bdevs[i]); } } @@ -253,6 +255,7 @@ spdk_rpc_bdev_raid_create(struct spdk_jsonrpc_request *request, struct spdk_json_write_ctx *w; struct raid_bdev_config *raid_cfg; int rc; + size_t i; if (spdk_json_decode_object(params, rpc_bdev_raid_create_decoders, SPDK_COUNTOF(rpc_bdev_raid_create_decoders), @@ -284,7 +287,7 @@ spdk_rpc_bdev_raid_create(struct spdk_jsonrpc_request *request, goto cleanup; } - for (size_t i = 0; i < req.base_bdevs.num_base_bdevs; i++) { + for (i = 0; i < req.base_bdevs.num_base_bdevs; i++) { rc = raid_bdev_config_add_base_bdev(raid_cfg, req.base_bdevs.base_bdevs[i], i); if (rc != 0) { raid_bdev_config_cleanup(raid_cfg);