From 1ba98593534c43d6f26bb1bb1234349c12956b5f Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 8 Apr 2019 15:57:04 +0900 Subject: [PATCH] bdev/raid: Change the prefix of names of lists from g_spdk_ to g_ Configuration lists in RAID bdev are unlikely to be exposed outside of the RAID bdev module. Hence simply the prefix g_ will be enough to clarify they are global data structure in RAID bdev module. Change-Id: I9df88db8fa651d5af7d771d88ff04bb5997079c9 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450563 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Reviewed-by: Darek Stojaczyk --- lib/bdev/raid/bdev_raid.c | 62 +++++++++---------- lib/bdev/raid/bdev_raid.h | 18 +++--- lib/bdev/raid/bdev_raid_rpc.c | 8 +-- test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c | 36 +++++------ 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lib/bdev/raid/bdev_raid.c b/lib/bdev/raid/bdev_raid.c index e86c61b2a..1a4e7ec45 100644 --- a/lib/bdev/raid/bdev_raid.c +++ b/lib/bdev/raid/bdev_raid.c @@ -44,24 +44,24 @@ static bool g_shutdown_started = false; /* raid bdev config as read from config file */ -struct raid_config g_spdk_raid_config = { - .raid_bdev_config_head = TAILQ_HEAD_INITIALIZER(g_spdk_raid_config.raid_bdev_config_head), +struct raid_config g_raid_config = { + .raid_bdev_config_head = TAILQ_HEAD_INITIALIZER(g_raid_config.raid_bdev_config_head), }; /* * List of raid bdev in configured list, these raid bdevs are registered with * bdev layer */ -struct spdk_raid_configured_tailq g_spdk_raid_bdev_configured_list; +struct raid_configured_tailq g_raid_bdev_configured_list; /* List of raid bdev in configuring list */ -struct spdk_raid_configuring_tailq g_spdk_raid_bdev_configuring_list; +struct raid_configuring_tailq g_raid_bdev_configuring_list; /* List of all raid bdevs */ -struct spdk_raid_all_tailq g_spdk_raid_bdev_list; +struct raid_all_tailq g_raid_bdev_list; /* List of all raid bdevs that are offline */ -struct spdk_raid_offline_tailq g_spdk_raid_bdev_offline_list; +struct raid_offline_tailq g_raid_bdev_offline_list; /* Function declarations */ static void raid_bdev_examine(struct spdk_bdev *bdev); @@ -166,13 +166,13 @@ raid_bdev_cleanup(struct raid_bdev *raid_bdev) raid_bdev, 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, state_link); + TAILQ_REMOVE(&g_raid_bdev_configuring_list, raid_bdev, state_link); } else if (raid_bdev->state == RAID_BDEV_STATE_OFFLINE) { - TAILQ_REMOVE(&g_spdk_raid_bdev_offline_list, raid_bdev, state_link); + TAILQ_REMOVE(&g_raid_bdev_offline_list, raid_bdev, state_link); } else { assert(0); } - TAILQ_REMOVE(&g_spdk_raid_bdev_list, raid_bdev, global_link); + TAILQ_REMOVE(&g_raid_bdev_list, raid_bdev, global_link); free(raid_bdev->bdev.name); raid_bdev->bdev.name = NULL; free(raid_bdev->base_bdev_info); @@ -239,9 +239,9 @@ raid_bdev_destruct(void *ctxt) } if (g_shutdown_started) { - TAILQ_REMOVE(&g_spdk_raid_bdev_configured_list, raid_bdev, state_link); + TAILQ_REMOVE(&g_raid_bdev_configured_list, raid_bdev, state_link); raid_bdev->state = RAID_BDEV_STATE_OFFLINE; - TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_offline_list, raid_bdev, state_link); + TAILQ_INSERT_TAIL(&g_raid_bdev_offline_list, raid_bdev, state_link); spdk_io_device_unregister(raid_bdev, NULL); } @@ -1043,8 +1043,8 @@ raid_bdev_config_cleanup(struct raid_bdev_config *raid_cfg) { uint32_t i; - TAILQ_REMOVE(&g_spdk_raid_config.raid_bdev_config_head, raid_cfg, link); - g_spdk_raid_config.total_raid_bdev--; + TAILQ_REMOVE(&g_raid_config.raid_bdev_config_head, raid_cfg, link); + g_raid_config.total_raid_bdev--; if (raid_cfg->base_bdev) { for (i = 0; i < raid_cfg->num_base_bdevs; i++) { @@ -1071,7 +1071,7 @@ raid_bdev_free(void) struct raid_bdev_config *raid_cfg, *tmp; SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_free\n"); - TAILQ_FOREACH_SAFE(raid_cfg, &g_spdk_raid_config.raid_bdev_config_head, link, tmp) { + TAILQ_FOREACH_SAFE(raid_cfg, &g_raid_config.raid_bdev_config_head, link, tmp) { raid_bdev_config_cleanup(raid_cfg); } } @@ -1088,7 +1088,7 @@ raid_bdev_config_find_by_name(const char *raid_name) { struct raid_bdev_config *raid_cfg; - TAILQ_FOREACH(raid_cfg, &g_spdk_raid_config.raid_bdev_config_head, link) { + TAILQ_FOREACH(raid_cfg, &g_raid_config.raid_bdev_config_head, link) { if (!strcmp(raid_cfg->name, raid_name)) { return raid_cfg; } @@ -1161,8 +1161,8 @@ raid_bdev_config_add(const char *raid_name, int strip_size, int num_base_bdevs, return -ENOMEM; } - TAILQ_INSERT_TAIL(&g_spdk_raid_config.raid_bdev_config_head, raid_cfg, link); - g_spdk_raid_config.total_raid_bdev++; + TAILQ_INSERT_TAIL(&g_raid_config.raid_bdev_config_head, raid_cfg, link); + g_raid_config.total_raid_bdev++; *_raid_cfg = raid_cfg; return 0; @@ -1188,7 +1188,7 @@ raid_bdev_config_add_base_bdev(struct raid_bdev_config *raid_cfg, const char *ba return -EINVAL; } - TAILQ_FOREACH(tmp, &g_spdk_raid_config.raid_bdev_config_head, link) { + TAILQ_FOREACH(tmp, &g_raid_config.raid_bdev_config_head, link) { for (i = 0; i < tmp->num_base_bdevs; i++) { if (tmp->base_bdev[i].name != NULL) { if (!strcmp(tmp->base_bdev[i].name, base_bdev_name)) { @@ -1400,7 +1400,7 @@ raid_bdev_get_running_config(FILE *fp) int index = 1; uint16_t i; - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_configured_list, state_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_configured_list, state_link) { fprintf(fp, "\n" "[RAID%d]\n" @@ -1446,7 +1446,7 @@ raid_bdev_can_claim_bdev(const char *bdev_name, struct raid_bdev_config **_raid_ struct raid_bdev_config *raid_cfg; uint32_t i; - TAILQ_FOREACH(raid_cfg, &g_spdk_raid_config.raid_bdev_config_head, link) { + TAILQ_FOREACH(raid_cfg, &g_raid_config.raid_bdev_config_head, link) { for (i = 0; i < raid_cfg->num_base_bdevs; i++) { /* * Check if the base bdev name is part of raid bdev configuration. @@ -1492,10 +1492,10 @@ raid_bdev_init(void) { int ret; - TAILQ_INIT(&g_spdk_raid_bdev_configured_list); - TAILQ_INIT(&g_spdk_raid_bdev_configuring_list); - TAILQ_INIT(&g_spdk_raid_bdev_list); - TAILQ_INIT(&g_spdk_raid_bdev_offline_list); + TAILQ_INIT(&g_raid_bdev_configured_list); + TAILQ_INIT(&g_raid_bdev_configuring_list); + TAILQ_INIT(&g_raid_bdev_list); + TAILQ_INIT(&g_raid_bdev_offline_list); /* Parse config file for raids */ ret = raid_bdev_parse_config(); @@ -1565,8 +1565,8 @@ raid_bdev_create(struct raid_bdev_config *raid_cfg) raid_bdev_gen->module = &g_raid_if; raid_bdev_gen->write_cache = 0; - TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_configuring_list, raid_bdev, state_link); - TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_list, raid_bdev, global_link); + TAILQ_INSERT_TAIL(&g_raid_bdev_configuring_list, raid_bdev, state_link); + TAILQ_INSERT_TAIL(&g_raid_bdev_list, raid_bdev, global_link); raid_cfg->raid_bdev = raid_bdev; @@ -1699,8 +1699,8 @@ raid_bdev_configure(struct raid_bdev *raid_bdev) return rc; } SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid bdev generic %p\n", raid_bdev_gen); - TAILQ_REMOVE(&g_spdk_raid_bdev_configuring_list, raid_bdev, state_link); - TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_configured_list, raid_bdev, state_link); + TAILQ_REMOVE(&g_raid_bdev_configuring_list, raid_bdev, state_link); + TAILQ_INSERT_TAIL(&g_raid_bdev_configured_list, raid_bdev, state_link); SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid bdev is created with name %s, raid_bdev %p\n", raid_bdev_gen->name, raid_bdev); } @@ -1726,10 +1726,10 @@ raid_bdev_deconfigure(struct raid_bdev *raid_bdev) } assert(raid_bdev->num_base_bdevs == raid_bdev->num_base_bdevs_discovered); - TAILQ_REMOVE(&g_spdk_raid_bdev_configured_list, raid_bdev, state_link); + TAILQ_REMOVE(&g_raid_bdev_configured_list, raid_bdev, state_link); raid_bdev->state = RAID_BDEV_STATE_OFFLINE; assert(raid_bdev->num_base_bdevs_discovered); - TAILQ_INSERT_TAIL(&g_spdk_raid_bdev_offline_list, raid_bdev, state_link); + TAILQ_INSERT_TAIL(&g_raid_bdev_offline_list, raid_bdev, state_link); SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid bdev state chaning from online to offline\n"); spdk_io_device_unregister(raid_bdev, NULL); @@ -1756,7 +1756,7 @@ raid_bdev_remove_base_bdev(void *ctx) SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_remove_base_bdev\n"); /* Find the raid_bdev which has claimed this base_bdev */ - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_list, global_link) { for (i = 0; i < raid_bdev->num_base_bdevs; i++) { if (raid_bdev->base_bdev_info[i].bdev == base_bdev) { diff --git a/lib/bdev/raid/bdev_raid.h b/lib/bdev/raid/bdev_raid.h index 2fc9c101c..8733c81d9 100644 --- a/lib/bdev/raid/bdev_raid.h +++ b/lib/bdev/raid/bdev_raid.h @@ -203,16 +203,16 @@ struct raid_bdev_io_channel { }; /* TAIL heads for various raid bdev lists */ -TAILQ_HEAD(spdk_raid_configured_tailq, raid_bdev); -TAILQ_HEAD(spdk_raid_configuring_tailq, raid_bdev); -TAILQ_HEAD(spdk_raid_all_tailq, raid_bdev); -TAILQ_HEAD(spdk_raid_offline_tailq, raid_bdev); +TAILQ_HEAD(raid_configured_tailq, raid_bdev); +TAILQ_HEAD(raid_configuring_tailq, raid_bdev); +TAILQ_HEAD(raid_all_tailq, raid_bdev); +TAILQ_HEAD(raid_offline_tailq, raid_bdev); -extern struct spdk_raid_configured_tailq g_spdk_raid_bdev_configured_list; -extern struct spdk_raid_configuring_tailq g_spdk_raid_bdev_configuring_list; -extern struct spdk_raid_all_tailq g_spdk_raid_bdev_list; -extern struct spdk_raid_offline_tailq g_spdk_raid_bdev_offline_list; -extern struct raid_config g_spdk_raid_config; +extern struct raid_configured_tailq g_raid_bdev_configured_list; +extern struct raid_configuring_tailq g_raid_bdev_configuring_list; +extern struct raid_all_tailq g_raid_bdev_list; +extern struct raid_offline_tailq g_raid_bdev_offline_list; +extern struct raid_config g_raid_config; int raid_bdev_create(struct raid_bdev_config *raid_cfg); void raid_bdev_remove_base_bdev(void *ctx); diff --git a/lib/bdev/raid/bdev_raid_rpc.c b/lib/bdev/raid/bdev_raid_rpc.c index fda33ecf6..80bbbd0a6 100644 --- a/lib/bdev/raid/bdev_raid_rpc.c +++ b/lib/bdev/raid/bdev_raid_rpc.c @@ -122,19 +122,19 @@ spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request, const struct spdk_ /* Get raid bdev list based on the category requested */ if (strcmp(req.category, "all") == 0) { - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_list, global_link) { spdk_json_write_string(w, raid_bdev->bdev.name); } } else if (strcmp(req.category, "online") == 0) { - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_configured_list, state_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_configured_list, state_link) { spdk_json_write_string(w, raid_bdev->bdev.name); } } else if (strcmp(req.category, "configuring") == 0) { - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_configuring_list, state_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_configuring_list, state_link) { spdk_json_write_string(w, raid_bdev->bdev.name); } } else { - TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_offline_list, state_link) { + TAILQ_FOREACH(raid_bdev, &g_raid_bdev_offline_list, state_link) { spdk_json_write_string(w, raid_bdev->bdev.name); } } 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 961180238..b95582f84 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 @@ -987,7 +987,7 @@ verify_raid_config_present(const char *name, bool presence) cfg_found = false; - TAILQ_FOREACH(raid_cfg, &g_spdk_raid_config.raid_bdev_config_head, link) { + TAILQ_FOREACH(raid_cfg, &g_raid_config.raid_bdev_config_head, link) { if (raid_cfg->name != NULL) { if (strcmp(name, raid_cfg->name) == 0) { cfg_found = true; @@ -1010,7 +1010,7 @@ verify_raid_bdev_present(const char *name, bool presence) bool pbdev_found; pbdev_found = false; - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, name) == 0) { pbdev_found = true; break; @@ -1029,7 +1029,7 @@ verify_raid_config(struct rpc_construct_raid_bdev *r, bool presence) uint32_t i; int val; - TAILQ_FOREACH(raid_cfg, &g_spdk_raid_config.raid_bdev_config_head, link) { + TAILQ_FOREACH(raid_cfg, &g_raid_config.raid_bdev_config_head, link) { if (strcmp(r->name, raid_cfg->name) == 0) { if (presence == false) { break; @@ -1065,7 +1065,7 @@ verify_raid_bdev(struct rpc_construct_raid_bdev *r, bool presence, uint32_t raid uint64_t min_blockcnt = 0xFFFFFFFFFFFFFFFF; pbdev_found = false; - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, r->name) == 0) { pbdev_found = true; if (presence == false) { @@ -1119,21 +1119,21 @@ verify_raid_bdev(struct rpc_construct_raid_bdev *r, bool presence, uint32_t raid } pbdev_found = false; if (raid_state == RAID_BDEV_STATE_ONLINE) { - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_configured_list, state_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_configured_list, state_link) { if (strcmp(pbdev->bdev.name, r->name) == 0) { pbdev_found = true; break; } } } else if (raid_state == RAID_BDEV_STATE_CONFIGURING) { - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_configuring_list, state_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_configuring_list, state_link) { if (strcmp(pbdev->bdev.name, r->name) == 0) { pbdev_found = true; break; } } } else if (raid_state == RAID_BDEV_STATE_OFFLINE) { - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_offline_list, state_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_offline_list, state_link) { if (strcmp(pbdev->bdev.name, r->name) == 0) { pbdev_found = true; break; @@ -1542,7 +1542,7 @@ test_io_channel(void) verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -1602,7 +1602,7 @@ test_write_io(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -1680,7 +1680,7 @@ test_read_io(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -1832,7 +1832,7 @@ test_unmap_io(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -1914,7 +1914,7 @@ test_io_failure(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -2008,7 +2008,7 @@ test_reset_io(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -2088,7 +2088,7 @@ test_io_waitq(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&req, true); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; } @@ -2326,7 +2326,7 @@ test_multi_raid_with_io(void) CU_ASSERT(g_rpc_err == 0); verify_raid_config(&construct_req[i], true); verify_raid_bdev(&construct_req[i], true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, construct_req[i].name) == 0) { break; } @@ -2352,7 +2352,7 @@ test_multi_raid_with_io(void) raid_random = rand() % g_max_raids; ch_random = &ch[raid_random]; ch_ctx_random = spdk_io_channel_get_ctx(ch_random); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, construct_req[raid_random].name) == 0) { break; } @@ -2368,7 +2368,7 @@ test_multi_raid_with_io(void) } for (i = 0; i < g_max_raids; i++) { - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, construct_req[i].name) == 0) { break; } @@ -2547,7 +2547,7 @@ test_raid_json_dump_info(void) CU_ASSERT(g_rpc_err == 0); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); - TAILQ_FOREACH(pbdev, &g_spdk_raid_bdev_list, global_link) { + TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { if (strcmp(pbdev->bdev.name, req.name) == 0) { break; }