From 3fe748f728ffa782ee0d83d73c79e406937d76c3 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 27 Aug 2020 15:37:57 -0700 Subject: [PATCH] blob: move bs_release_cluster We will use it earlier in this file in a future patch. Signed-off-by: Jim Harris Change-Id: I554f2073185d466bd0b4e98bdeec721f763c1b44 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3969 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- lib/blob/blobstore.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 2fcf6fe29..0dadf92c4 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -118,6 +118,21 @@ bs_claim_cluster(struct spdk_blob_store *bs, uint32_t cluster_num) bs->num_free_clusters--; } +static void +bs_release_cluster(struct spdk_blob_store *bs, uint32_t cluster_num) +{ + assert(cluster_num < spdk_bit_array_capacity(bs->used_clusters)); + assert(spdk_bit_array_get(bs->used_clusters, cluster_num) == true); + assert(bs->num_free_clusters < bs->total_clusters); + + SPDK_DEBUGLOG(SPDK_LOG_BLOB, "Releasing cluster %u\n", cluster_num); + + pthread_mutex_lock(&bs->used_clusters_mutex); + spdk_bit_array_clear(bs->used_clusters, cluster_num); + bs->num_free_clusters++; + pthread_mutex_unlock(&bs->used_clusters_mutex); +} + static int blob_insert_cluster(struct spdk_blob *blob, uint32_t cluster_num, uint64_t cluster) { @@ -178,21 +193,6 @@ bs_allocate_cluster(struct spdk_blob *blob, uint32_t cluster_num, return 0; } -static void -bs_release_cluster(struct spdk_blob_store *bs, uint32_t cluster_num) -{ - assert(cluster_num < spdk_bit_array_capacity(bs->used_clusters)); - assert(spdk_bit_array_get(bs->used_clusters, cluster_num) == true); - assert(bs->num_free_clusters < bs->total_clusters); - - SPDK_DEBUGLOG(SPDK_LOG_BLOB, "Releasing cluster %u\n", cluster_num); - - pthread_mutex_lock(&bs->used_clusters_mutex); - spdk_bit_array_clear(bs->used_clusters, cluster_num); - bs->num_free_clusters++; - pthread_mutex_unlock(&bs->used_clusters_mutex); -} - static void blob_xattrs_init(struct spdk_blob_xattr_opts *xattrs) {