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

bdev/raid: Refactor raid_bdev_remove_base_bdev

Browse Source 
Put the core operation into the loop without using the found flag.

Change-Id: I6509988f11a87e7a7f0ffbad46a090837ee9de20
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/430512
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-10-24 09:52:47 +09:00 committed by Jim Harris
parent 935c0b4745
commit 8f06e9528d
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/bdev/raid/bdev_raid.c
View File

@ -1456,10 +1456,9 @@ raid_bdev_deconfigure(struct raid_bdev *raid_bdev)
void void
raid_bdev_remove_base_bdev(void *ctx) raid_bdev_remove_base_bdev(void *ctx)
{ {
struct spdk_bdev *base_bdev = ctx; struct spdk_bdev *base_bdev = ctx;
struct raid_bdev *raid_bdev; struct raid_bdev *raid_bdev;
uint16_t i; uint16_t i;
bool found = false;
SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_remove_base_bdev\n"); SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_remove_base_bdev\n");
@ -1467,38 +1466,31 @@ raid_bdev_remove_base_bdev(void *ctx)
TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_list, global_link) { TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_list, global_link) {
for (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 == base_bdev) { if (raid_bdev->base_bdev_info[i].bdev == base_bdev) {
found = true;
break; assert(raid_bdev->base_bdev_info[i].desc);
raid_bdev->base_bdev_info[i].remove_scheduled = true;
if (raid_bdev->destruct_called == true ||
raid_bdev->state == RAID_BDEV_STATE_CONFIGURING) {
/*
* As raid bdev is not registered yet or already unregistered,
* so cleanup should be done here itself.
*/
raid_bdev_free_base_bdev_resource(raid_bdev, i);
if (raid_bdev->num_base_bdevs_discovered == 0) {
/* There is no base bdev for this raid, so free the raid device. */
raid_bdev_cleanup(raid_bdev);
return;
}
}
raid_bdev_deconfigure(raid_bdev);
return;
} }
} }
if (found == true) {
break;
}
} }
if (found == false) { SPDK_ERRLOG("bdev to remove '%s' not found\n", base_bdev->name);
SPDK_ERRLOG("bdev to remove '%s' not found\n", base_bdev->name);
return;
}
assert(raid_bdev->base_bdev_info[i].desc);
raid_bdev->base_bdev_info[i].remove_scheduled = true;
if (raid_bdev->destruct_called == true ||
raid_bdev->state == RAID_BDEV_STATE_CONFIGURING) {
/*
* As raid bdev is not registered yet or already unregistered, so cleanup
* should be done here itself
*/
raid_bdev_free_base_bdev_resource(raid_bdev, i);
if (raid_bdev->num_base_bdevs_discovered == 0) {
/* Since there is no base bdev for this raid, so free the raid device */
raid_bdev_cleanup(raid_bdev);
return;
}
}
raid_bdev_deconfigure(raid_bdev);
} }
/* /*