From 3aee16f7a5c07faa3bc778cfe99f103d43f84bfd Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 3 Sep 2021 16:46:14 -0500
Subject: [PATCH] os/bluestore: fix/simplify zoned_cleaner thread start error
 handling

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/os/bluestore/BlueStore.cc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 39c2865b343..b8965199107 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7266,22 +7266,17 @@ int BlueStore::_mount()
     }
   });
 
+  r = _deferred_replay();
+  if (r < 0) {
+    return r;
+  }
+
 #ifdef HAVE_LIBZBD
-  using scope_guard_t = scope_guard<std::function<void()>>;
-  std::optional<scope_guard_t> stop_zoned_cleaner;
   if (bdev->is_smr()) {
     _zoned_cleaner_start();
-    stop_zoned_cleaner = scope_guard_t([this] {
-      _zoned_cleaner_stop();
-    });
   }
 #endif
 
-  r = _deferred_replay();
-  if (r < 0) {
-    return r;
-  }
-
   mempool_thread.init();
 
   if ((!per_pool_stat_collection || per_pool_omap != OMAP_PER_PG) &&
-- 
2.39.5