From ebb908575515a56be9eacd654b29aac13f8d8570 Mon Sep 17 00:00:00 2001 From: Mike Gerdts Date: Sun, 9 Apr 2023 08:48:25 -0500 Subject: [PATCH] vbdev_lvol: early return in _vbdev_lvs_remove 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 Change-Id: Ief74d9fd166b2fe1042c78e12fe79d5f325aa502 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17548 Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris --- module/bdev/lvol/vbdev_lvol.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c index f9629f639..1439e6c0b 100644 --- a/module/bdev/lvol/vbdev_lvol.c +++ b/module/bdev/lvol/vbdev_lvol.c @@ -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); } }