From a4b975244d7c2e268cb20086875664678d280df8 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 21 Aug 2018 09:13:44 +0900 Subject: [PATCH] bdev/raid: Simplify variable name in struct raid_bdev struct raid_bdev has a pointer raid_bdev_config to its configuration, but raid_bdev is duplicated between raid_bdev and raid_bdev_config and just config may be enough as a name. Change-Id: I77f6a69b913cd540c22f05803c486a4caf103f24 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/422923 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Kunal Sablok --- lib/bdev/raid/bdev_raid.c | 12 ++++++------ lib/bdev/raid/bdev_raid.h | 2 +- test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/bdev/raid/bdev_raid.c b/lib/bdev/raid/bdev_raid.c index c80de518b..e401f345a 100644 --- a/lib/bdev/raid/bdev_raid.c +++ b/lib/bdev/raid/bdev_raid.c @@ -162,9 +162,9 @@ raid_bdev_destroy_cb(void *io_device, void *ctx_buf) static void raid_bdev_cleanup(struct raid_bdev *raid_bdev) { - SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_cleanup, %p name %s, state %u, raid_bdev_config %p\n", + SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_cleanup, %p name %s, state %u, config %p\n", raid_bdev, - raid_bdev->bdev.name, raid_bdev->state, raid_bdev->raid_bdev_config); + raid_bdev->bdev.name, raid_bdev->state, raid_bdev->config); if (raid_bdev->state == RAID_BDEV_STATE_CONFIGURING) { TAILQ_REMOVE(&g_spdk_raid_bdev_configuring_list, raid_bdev, link_specific_list); } else if (raid_bdev->state == RAID_BDEV_STATE_OFFLINE) { @@ -178,8 +178,8 @@ raid_bdev_cleanup(struct raid_bdev *raid_bdev) assert(raid_bdev->base_bdev_info); free(raid_bdev->base_bdev_info); raid_bdev->base_bdev_info = NULL; - if (raid_bdev->raid_bdev_config) { - raid_bdev->raid_bdev_config->raid_bdev = NULL; + if (raid_bdev->config) { + raid_bdev->config->raid_bdev = NULL; } free(raid_bdev); } @@ -1218,7 +1218,7 @@ raid_bdev_create(struct raid_bdev_config *raid_cfg, struct raid_bdev **_raid_bde raid_bdev->strip_size = raid_cfg->strip_size; raid_bdev->state = RAID_BDEV_STATE_CONFIGURING; - raid_bdev->raid_bdev_config = raid_cfg; + raid_bdev->config = raid_cfg; TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_configuring_list, raid_bdev, link_specific_list); TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_list, raid_bdev, link_global_list); @@ -1306,7 +1306,7 @@ raid_bdev_configure(struct raid_bdev *raid_bdev) } raid_bdev_gen = &raid_bdev->bdev; - raid_bdev_gen->name = strdup(raid_bdev->raid_bdev_config->name); + raid_bdev_gen->name = strdup(raid_bdev->config->name); if (!raid_bdev_gen->name) { SPDK_ERRLOG("Unable to allocate name for raid\n"); goto offline; diff --git a/lib/bdev/raid/bdev_raid.h b/lib/bdev/raid/bdev_raid.h index 482319240..4652fb07a 100644 --- a/lib/bdev/raid/bdev_raid.h +++ b/lib/bdev/raid/bdev_raid.h @@ -93,7 +93,7 @@ struct raid_bdev { TAILQ_ENTRY(raid_bdev) link_global_list; /* pointer to config file entry */ - struct raid_bdev_config *raid_bdev_config; + struct raid_bdev_config *config; /* array of base bdev info */ struct raid_base_bdev_info *base_bdev_info; diff --git a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c index c712fdb58..b3be07d7e 100644 --- a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c +++ b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c @@ -828,7 +828,7 @@ verify_raid_bdev(struct rpc_construct_raid_bdev *r, bool presence, uint32_t raid if (presence == false) { break; } - CU_ASSERT(pbdev->raid_bdev_config->raid_bdev == pbdev); + CU_ASSERT(pbdev->config->raid_bdev == pbdev); CU_ASSERT(pbdev->base_bdev_info != NULL); CU_ASSERT(pbdev->strip_size == ((r->strip_size * 1024) / g_block_len)); CU_ASSERT(pbdev->strip_size_shift == spdk_u32log2(((r->strip_size * 1024) / g_block_len)));