diff --git a/include/spdk_internal/bdev.h b/include/spdk_internal/bdev.h index 8854caf50..3ccc03ca2 100644 --- a/include/spdk_internal/bdev.h +++ b/include/spdk_internal/bdev.h @@ -229,8 +229,6 @@ struct spdk_bdev { TAILQ_ENTRY(spdk_bdev) vbdev_link; - bool bdev_opened; - /** * Pointer to the module that has claimed this bdev for purposes of creating virtual * bdevs on top of it. Set to NULL if the bdev has not been claimed. @@ -424,8 +422,6 @@ void spdk_scsi_nvme_translate(const struct spdk_bdev_io *bdev_io, void spdk_bdev_module_list_add(struct spdk_bdev_module_if *bdev_module); -bool spdk_is_bdev_opened(struct spdk_bdev *bdev); - static inline struct spdk_bdev_io * spdk_bdev_io_from_ctx(void *ctx) { diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 41aab2a9c..1d9e97ab2 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1638,7 +1638,6 @@ _spdk_bdev_register(struct spdk_bdev *bdev) bdev->status = SPDK_BDEV_STATUS_READY; TAILQ_INIT(&bdev->open_descs); - bdev->bdev_opened = false; TAILQ_INIT(&bdev->vbdevs); TAILQ_INIT(&bdev->base_bdevs); @@ -1731,24 +1730,6 @@ spdk_vbdev_unregister(struct spdk_bdev *vbdev) spdk_bdev_unregister(vbdev); } -bool -spdk_is_bdev_opened(struct spdk_bdev *bdev) -{ - struct spdk_bdev *base; - - if (bdev->bdev_opened) { - return true; - } - - TAILQ_FOREACH(base, &bdev->base_bdevs, base_bdev_link) { - if (spdk_is_bdev_opened(base)) { - return true; - } - } - - return false; -} - int spdk_bdev_open(struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_cb, void *remove_ctx, struct spdk_bdev_desc **_desc) @@ -1771,8 +1752,6 @@ spdk_bdev_open(struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_ TAILQ_INSERT_TAIL(&bdev->open_descs, desc, link); - bdev->bdev_opened = true; - desc->bdev = bdev; desc->remove_cb = remove_cb; desc->remove_ctx = remove_ctx; @@ -1792,8 +1771,6 @@ spdk_bdev_close(struct spdk_bdev_desc *desc) pthread_mutex_lock(&bdev->mutex); - bdev->bdev_opened = false; - TAILQ_REMOVE(&bdev->open_descs, desc, link); free(desc); diff --git a/lib/bdev/lvol/vbdev_lvol.c b/lib/bdev/lvol/vbdev_lvol.c index bda4d5ede..b8c3066ab 100644 --- a/lib/bdev/lvol/vbdev_lvol.c +++ b/lib/bdev/lvol/vbdev_lvol.c @@ -567,11 +567,6 @@ vbdev_lvol_resize(char *name, size_t sz, return -1; } - if (spdk_is_bdev_opened(bdev)) { - SPDK_ERRLOG("bdev '%s' cannot be resized because it is currently opened\n", name); - return -1; - } - lvs = lvol->lvol_store; cluster_size = spdk_bs_get_cluster_size(lvs->blobstore); 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 396fb9b0e..251de828c 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 @@ -185,24 +185,6 @@ spdk_lvol_destroy(struct spdk_lvol *lvol) g_lvol = NULL; } -bool -spdk_is_bdev_opened(struct spdk_bdev *bdev) -{ - struct spdk_bdev *base; - - if (bdev->bdev_opened) { - return true; - } - - TAILQ_FOREACH(base, &bdev->base_bdevs, base_bdev_link) { - if (spdk_is_bdev_opened(base)) { - return true; - } - } - - return false; -} - void spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status status) { @@ -430,7 +412,6 @@ ut_lvol_resize(void) CU_ASSERT(g_lvolerrno == 0); SPDK_CU_ASSERT_FATAL(g_lvol != NULL); - g_base_bdev->bdev_opened = false; g_base_bdev->ctxt = g_lvol; g_base_bdev->name = spdk_sprintf_alloc("%s", g_lvol->name); @@ -440,13 +421,7 @@ ut_lvol_resize(void) CU_ASSERT(rc == 0); CU_ASSERT(g_base_bdev->blockcnt == 20 * g_cluster_size / g_base_bdev->blocklen); - /* Resize while bdev is open */ - g_base_bdev->bdev_opened = true; - rc = vbdev_lvol_resize(g_lvol->name, 20, vbdev_lvol_resize_complete, NULL); - CU_ASSERT(rc != 0); - /* Resize with wrong bdev name */ - g_base_bdev->bdev_opened = false; rc = vbdev_lvol_resize("wrong name", 20, vbdev_lvol_resize_complete, NULL); CU_ASSERT(rc != 0);