update sources to v12.1.0

[ceph.git] / ceph / src / tools / rbd_mirror / ImageDeleter.cc

diff --git a/ceph/src/tools/rbd_mirror/ImageDeleter.cc b/ceph/src/tools/rbd_mirror/ImageDeleter.cc
index b2eb615a7e4a240132cca67ad1a65612f9a7dfb4..b3b1c4429d3bfb01bec06acd5bfcb5aaa42307d7 100644 (file)
--- a/ceph/src/tools/rbd_mirror/ImageDeleter.cc
+++ b/ceph/src/tools/rbd_mirror/ImageDeleter.cc
@@ -479,11 +479,9 @@ int ImageDeleter::image_has_snapshots_and_children(IoCtx *ioctx,
 void ImageDeleter::complete_active_delete(int r) {
   dout(20) << dendl;
 
-  m_delete_lock.Lock();
-  DeleteInfo *del_info = m_active_delete.release();
-  assert(del_info != nullptr);
-  m_delete_lock.Unlock();
-  del_info->notify(r);
+  Mutex::Locker delete_locker(m_delete_lock);
+  m_active_delete->notify(r);
+  m_active_delete.reset();
 }
 
 void ImageDeleter::enqueue_failed_delete(int error_code) {