From 2e1b12b45fbca6f7bdcf663dc163f77eea7cdcd5 Mon Sep 17 00:00:00 2001 From: Mike Gerdts Date: Tue, 11 Apr 2023 13:54:22 -0500 Subject: [PATCH] blob: esnap clones are not clones spdk_blob_is_clone() should return true only for normal clones. To detect esnap clones, use spdk_blob_is_esnap_clone(). This also clarifies documentation of spdk_blob_is_esnap_clone() to match the implementation. Signed-off-by: Mike Gerdts Change-Id: I9993ab60c1a097531a46fb6760124a632f6857cd Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17544 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- include/spdk/blob.h | 8 +++++--- lib/blob/blobstore.c | 3 ++- test/unit/lib/blob/blob.c/blob_ut.c | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/spdk/blob.h b/include/spdk/blob.h index 2f6ef0c39..40b9b67af 100644 --- a/include/spdk/blob.h +++ b/include/spdk/blob.h @@ -689,11 +689,13 @@ bool spdk_blob_is_read_only(struct spdk_blob *blob); bool spdk_blob_is_snapshot(struct spdk_blob *blob); /** - * Check if blob is a clone. + * Check if blob is a clone of a blob. + * + * Clones of external snapshots will return false. See spdk_blob_is_esnap_clone. * * \param blob Blob. * - * \return true if blob is a clone. + * \return true if blob is a clone of a blob. */ bool spdk_blob_is_clone(struct spdk_blob *blob); @@ -707,7 +709,7 @@ bool spdk_blob_is_clone(struct spdk_blob *blob); bool spdk_blob_is_thin_provisioned(struct spdk_blob *blob); /** - * Check if blob is a clone of an external bdev. + * Check if blob is a clone of an external snapshot. * * \param blob Blob. * diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 065beebb7..7be85c74c 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -8478,7 +8478,8 @@ spdk_blob_is_clone(struct spdk_blob *blob) { assert(blob != NULL); - if (blob->parent_id != SPDK_BLOBID_INVALID) { + if (blob->parent_id != SPDK_BLOBID_INVALID && + blob->parent_id != SPDK_BLOBID_EXTERNAL_SNAPSHOT) { assert(spdk_blob_is_thin_provisioned(blob)); return true; } diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c index 0fa8debeb..e4c90abed 100644 --- a/test/unit/lib/blob/blob.c/blob_ut.c +++ b/test/unit/lib/blob/blob.c/blob_ut.c @@ -7486,6 +7486,7 @@ blob_esnap_create(void) SPDK_CU_ASSERT_FATAL(blob != NULL); SPDK_CU_ASSERT_FATAL(spdk_blob_is_esnap_clone(blob)); SPDK_CU_ASSERT_FATAL(blob_is_esnap_clone(blob)); + SPDK_CU_ASSERT_FATAL(!spdk_blob_is_clone(blob)); sz = spdk_blob_get_num_clusters(blob); CU_ASSERT(sz == esnap_num_clusters); ut_blob_close_and_delete(bs, blob);