From 5fb0e244ed2599011a28a30ebe54a710afb9b025 Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed@intel.com>
Date: Fri, 26 Apr 2019 17:46:58 +0200
Subject: [PATCH] blobstore: Add _spdk_bs_is_blob_deletable function

This patch adds new function which is used to check
if blob can be removed when requested.

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: Iafa82fba9bf67ffd15cf639f4665087f054b6b7d
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452242
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/blob/blobstore.c | 45 ++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c
index c06359014..d152b2143 100644
--- a/lib/blob/blobstore.c
+++ b/lib/blob/blobstore.c
@@ -5055,6 +5055,29 @@ _spdk_bs_delete_persist_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
 	spdk_blob_close(blob, _spdk_bs_delete_close_cpl, seq);
 }
 
+static int
+_spdk_bs_is_blob_deletable(struct spdk_blob *blob)
+{
+	struct spdk_blob_list *snapshot_entry = NULL;
+
+	if (blob->open_ref > 1) {
+		/* Someone has this blob open (besides this delete context). */
+		return -EBUSY;
+	}
+
+	/* Check if this is a snapshot with clones */
+	snapshot_entry = _spdk_bs_get_snapshot_entry(blob->bs, blob->id);
+	if (snapshot_entry != NULL) {
+		/* If snapshot have clones, we cannot remove it */
+		if (!TAILQ_EMPTY(&snapshot_entry->clones)) {
+			SPDK_ERRLOG("Cannot remove snapshot with clones\n");
+			return -EBUSY;
+		}
+	}
+
+	return 0;
+}
+
 static void
 _spdk_bs_delete_open_cpl(void *cb_arg, struct spdk_blob *blob, int bserrno)
 {
@@ -5069,27 +5092,12 @@ _spdk_bs_delete_open_cpl(void *cb_arg, struct spdk_blob *blob, int bserrno)
 
 	_spdk_blob_verify_md_op(blob);
 
-	if (blob->open_ref > 1) {
-		/*
-		 * Someone has this blob open (besides this delete context).
-		 *  Decrement the ref count directly and return -EBUSY.
-		 */
-		blob->open_ref--;
-		spdk_bs_sequence_finish(seq, -EBUSY);
+	bserrno = _spdk_bs_is_blob_deletable(blob);
+	if (bserrno) {
+		spdk_blob_close(blob, _spdk_bs_delete_ebusy_close_cpl, seq);
 		return;
 	}
 
-	/* Check if this is a snapshot with clones */
-	snapshot = _spdk_bs_get_snapshot_entry(blob->bs, blob->id);
-	if (snapshot != NULL) {
-		/* If snapshot have clones, we cannot remove it */
-		if (!TAILQ_EMPTY(&snapshot->clones)) {
-			SPDK_ERRLOG("Cannot remove snapshot with clones\n");
-			spdk_blob_close(blob, _spdk_bs_delete_ebusy_close_cpl, seq);
-			return;
-		}
-	}
-
 	_spdk_bs_blob_list_remove(blob);
 
 	if (blob->locked_operation_in_progress) {
@@ -5107,6 +5115,7 @@ _spdk_bs_delete_open_cpl(void *cb_arg, struct spdk_blob *blob, int bserrno)
 	TAILQ_REMOVE(&blob->bs->blobs, blob, link);
 
 	/* If blob is a snapshot then remove it from the list */
+	snapshot = _spdk_bs_get_snapshot_entry(blob->bs, blob->id);
 	if (snapshot != NULL) {
 		TAILQ_REMOVE(&blob->bs->snapshots, snapshot, link);
 		free(snapshot);