cephfs-mirror: call ceph_release() to cleanup mount alloc

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit cbd3647b091be80aadafa45ffdaebf1ba8e88a10)

diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc
index 7f2211a95f4787de6480d2d1a96c42301f6d6a21..33c3a311c8f1c13ce98868688a88623c44049fef 100644 (file)
--- a/src/tools/cephfs_mirror/FSMirror.cc
+++ b/src/tools/cephfs_mirror/FSMirror.cc
@@ -104,7 +104,6 @@ FSMirror::~FSMirror() {
     std::scoped_lock locker(m_lock);
     delete m_instance_watcher;
     delete m_mirror_watcher;
-    m_cluster.reset();
   }
   // outside the lock so that in-progress commands can acquire
   // lock and finish executing.
@@ -123,6 +122,7 @@ void FSMirror::shutdown_replayer(PeerReplayer *peer_replayer) {
 void FSMirror::cleanup() {
   dout(20) << dendl;
   ceph_unmount(m_mount);
+  ceph_release(m_mount);
   m_ioctx.close();
   m_cluster.reset();
 }

diff --git a/src/tools/cephfs_mirror/PeerReplayer.cc b/src/tools/cephfs_mirror/PeerReplayer.cc
index 49c4cbef59fd521e18ad4aad91286416dea458fc..15bc3309f2cee630d40a131d91e8f0cb8c046d56 100644 (file)
--- a/src/tools/cephfs_mirror/PeerReplayer.cc
+++ b/src/tools/cephfs_mirror/PeerReplayer.cc
@@ -187,6 +187,7 @@ void PeerReplayer::shutdown() {
   }
   m_replayers.clear();
   ceph_unmount(m_remote_mount);
+  ceph_release(m_remote_mount);
   m_remote_mount = nullptr;
   m_remote_cluster.reset();
 }