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

bdev/raid: Factor out free base bdev resource (desc and claim)

Browse Source 
Change-Id: I0fa309d9493ee8db87558bdf2ef48aec5b0e3a3f
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/421194
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@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>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-08-03 15:34:10 +09:00 committed by Ben Walker
parent 57dd0d5085
commit 9081a99211
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,32 @@ raid_bdev_cleanup(struct raid_bdev *raid_bdev)
free(raid_bdev);
}
/*
* brief:
* free resource of base bdev for raid bdev
* params:
* raid_bdev - pointer to raid bdev
* base_bdev_slot - position to base bdev in raid bdev
* returns:
* 0 - success
* non zero - failure
*/
static void
raid_bdev_free_base_bdev_resource(struct raid_bdev *raid_bdev, uint32_t base_bdev_slot)
{
struct raid_base_bdev_info *info;
info = &raid_bdev->base_bdev_info[base_bdev_slot];
spdk_bdev_module_release_bdev(info->base_bdev);
spdk_bdev_close(info->base_bdev_desc);
info->base_bdev_desc = NULL;
info->base_bdev = NULL;
assert(raid_bdev->num_base_bdevs_discovered);
raid_bdev->num_base_bdevs_discovered--;
}
/*
* brief:
* raid_bdev_destruct is the destruct function table pointer for raid bdev
@ -206,12 +232,7 @@ raid_bdev_destruct(void *ctxt)
*/
if ((raid_bdev->base_bdev_info[i].base_bdev_remove_scheduled == true) &&
(raid_bdev->base_bdev_info[i].base_bdev != NULL)) {
spdk_bdev_module_release_bdev(raid_bdev->base_bdev_info[i].base_bdev);
spdk_bdev_close(raid_bdev->base_bdev_info[i].base_bdev_desc);
raid_bdev->base_bdev_info[i].base_bdev_desc = NULL;
raid_bdev->base_bdev_info[i].base_bdev = NULL;
assert(raid_bdev->num_base_bdevs_discovered);
raid_bdev->num_base_bdevs_discovered--;
raid_bdev_free_base_bdev_resource(raid_bdev, i);
}
}
@ -1184,12 +1205,7 @@ raid_bdev_remove_base_bdev(void *ctx)
if (raid_bdev->destruct_called == true && raid_bdev->base_bdev_info[i].base_bdev != NULL) {
/* As raid bdev is already unregistered, so cleanup should be done here itself */
spdk_bdev_module_release_bdev(raid_bdev->base_bdev_info[i].base_bdev);
spdk_bdev_close(raid_bdev->base_bdev_info[i].base_bdev_desc);
raid_bdev->base_bdev_info[i].base_bdev_desc = NULL;
raid_bdev->base_bdev_info[i].base_bdev = NULL;
assert(raid_bdev->num_base_bdevs_discovered);
raid_bdev->num_base_bdevs_discovered--;
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);