From 7cfb12f437d6a355b71cbdc23ca60628fee78e2d Mon Sep 17 00:00:00 2001 From: GangCao Date: Thu, 19 May 2022 22:34:44 -0400 Subject: [PATCH] Bdev/Lvol: check base bdev's md before examining To fix issue #2514 Change-Id: If507382202e729f5934a354e2515a035ad5aeb0c Signed-off-by: GangCao Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12750 Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- module/bdev/lvol/vbdev_lvol.c | 7 +++++++ test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/module/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c index 57f161104..ef88b20b0 100644 --- a/module/bdev/lvol/vbdev_lvol.c +++ b/module/bdev/lvol/vbdev_lvol.c @@ -1441,6 +1441,13 @@ vbdev_lvs_examine(struct spdk_bdev *bdev) struct spdk_lvs_with_handle_req *req; int rc; + if (spdk_bdev_get_md_size(bdev) != 0) { + SPDK_INFOLOG(vbdev_lvol, "Cannot create bs dev on %s\n which is formatted with metadata", + bdev->name); + spdk_bdev_module_examine_done(&g_lvol_if); + return; + } + req = calloc(1, sizeof(*req)); if (req == NULL) { spdk_bdev_module_examine_done(&g_lvol_if); diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c index 309d1e6cf..3bb55651f 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c +++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c @@ -73,6 +73,12 @@ spdk_bdev_get_aliases(const struct spdk_bdev *bdev) return &bdev->aliases; } +uint32_t +spdk_bdev_get_md_size(const struct spdk_bdev *bdev) +{ + return bdev->md_len; +} + int spdk_bdev_alias_add(struct spdk_bdev *bdev, const char *alias) {