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

vbdev_lvol: early return in _vbdev_lvs_remove

Browse Source 
This replaces nested if statements with equivalent logic that uses
early returns. Now the code fits in 100 columns and will allow the next
patch in this series to avoid adding a fifth level of indentation.

Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: Ief74d9fd166b2fe1042c78e12fe79d5f325aa502
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17548
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Mike Gerdts 2023-04-09 08:48:25 -05:00 committed by Jim Harris
parent f3c14b8dee
commit a045d8d2fc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
module/bdev/lvol/vbdev_lvol.c
View File

@ -429,17 +429,17 @@ _vbdev_lvs_remove(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void
if (_vbdev_lvs_are_lvols_closed(lvs)) {
if (destroy) {
spdk_lvs_destroy(lvs, _vbdev_lvs_remove_cb, lvs_bdev);
} else {
spdk_lvs_unload(lvs, _vbdev_lvs_remove_cb, lvs_bdev);
}
} else {
if (destroy) {
_vbdev_lvs_remove_lvol_cb(lvs_bdev, 0);
} else {
TAILQ_FOREACH_SAFE(lvol, &lvs->lvols, link, tmp) {
spdk_bdev_unregister(lvol->bdev, _vbdev_lvs_remove_bdev_unregistered_cb, lvs_bdev);
}
return;
}
spdk_lvs_unload(lvs, _vbdev_lvs_remove_cb, lvs_bdev);
return;
}
if (destroy) {
_vbdev_lvs_remove_lvol_cb(lvs_bdev, 0);
return;
}
TAILQ_FOREACH_SAFE(lvol, &lvs->lvols, link, tmp) {
spdk_bdev_unregister(lvol->bdev, _vbdev_lvs_remove_bdev_unregistered_cb, lvs_bdev);
}
}