From a2dbc030f46e07cd56c430fd9e2cd635f1caaed2 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Thu, 28 Jan 2021 03:54:09 -0500 Subject: [PATCH] cephfs-mirror: call ceph_release() to cleanup mount alloc Signed-off-by: Venky Shankar (cherry picked from commit cbd3647b091be80aadafa45ffdaebf1ba8e88a10) --- src/tools/cephfs_mirror/FSMirror.cc | 2 +- src/tools/cephfs_mirror/PeerReplayer.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc index 7f2211a95f4..33c3a311c8f 100644 --- 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 49c4cbef59f..15bc3309f2c 100644 --- 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(); } -- 2.47.3