From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 25 Apr 2018 23:45:01 +0000 (-0400)
Subject: rbd-mirror: clean up ENOENT error message
X-Git-Tag: v13.1.0~40^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d5b146cfa6c72f02860f15d1ec330ff97ce0848;p=ceph.git

rbd-mirror: clean up ENOENT error message

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/tools/rbd_mirror/InstanceWatcher.cc b/src/tools/rbd_mirror/InstanceWatcher.cc
index 796b7bfe604c7..88faa67c07a7d 100644
--- a/src/tools/rbd_mirror/InstanceWatcher.cc
+++ b/src/tools/rbd_mirror/InstanceWatcher.cc
@@ -389,7 +389,6 @@ void InstanceWatcher<I>::remove(Context *on_finish) {
   assert(m_on_finish == nullptr);
   m_on_finish = on_finish;
   m_ret_val = 0;
-  m_removing = true;
 
   get_instance_locker();
 }
@@ -866,7 +865,7 @@ template <typename I>
 void InstanceWatcher<I>::handle_remove_instance_object(int r) {
   dout(10) << "r=" << r << dendl;
 
-  if (m_removing && r == -ENOENT) {
+  if (r == -ENOENT) {
     r = 0;
   }
 
@@ -938,10 +937,6 @@ void InstanceWatcher<I>::handle_wait_for_notify_ops(int r) {
 
     std::swap(on_finish, m_on_finish);
     r = m_ret_val;
-
-    if (m_removing) {
-      m_removing = false;
-    }
   }
   on_finish->complete(r);
 }
diff --git a/src/tools/rbd_mirror/InstanceWatcher.h b/src/tools/rbd_mirror/InstanceWatcher.h
index c3cd60500f75f..f9671585a2724 100644
--- a/src/tools/rbd_mirror/InstanceWatcher.h
+++ b/src/tools/rbd_mirror/InstanceWatcher.h
@@ -163,7 +163,6 @@ private:
   librbd::ManagedLock<ImageCtxT> *m_instance_lock;
   Context *m_on_finish = nullptr;
   int m_ret_val = 0;
-  bool m_removing = false;
   std::string m_leader_instance_id;
   librbd::managed_lock::Locker m_instance_locker;
   std::set<std::pair<std::string, C_NotifyInstanceRequest *>> m_notify_ops;