Commit a045d8d2 authored by Mike Gerdts's avatar Mike Gerdts Committed by Jim Harris
Browse files

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: default avatarMike Gerdts <mgerdts@nvidia.com>
Change-Id: Ief74d9fd166b2fe1042c78e12fe79d5f325aa502
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17548


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f3c14b8d

module/bdev/lvol/vbdev_lvol.c

+10 −10
Original line number Diff line number Diff line
@@ -429,19 +429,19 @@ _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 {

			return;

		}

		spdk_lvs_unload(lvs, _vbdev_lvs_remove_cb, lvs_bdev);

		return;

	}

	} else {

	if (destroy) {

		_vbdev_lvs_remove_lvol_cb(lvs_bdev, 0);

		} else {

		return;

	}

	TAILQ_FOREACH_SAFE(lvol, &lvs->lvols, link, tmp) {

		spdk_bdev_unregister(lvol->bdev, _vbdev_lvs_remove_bdev_unregistered_cb, lvs_bdev);

	}

}

	}

}



void

vbdev_lvs_unload(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void *cb_arg)