From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 27 Jul 2016 00:57:40 +0000 (-0400)
Subject: librbd: remove unused journal replay canceled callback
X-Git-Tag: v10.2.3~48^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9a84bad431f2d9916bdf88980b1cd2d0e36a1e5;p=ceph.git

librbd: remove unused journal replay canceled callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f453554edcb16ec72714b2456c08bab9e339b1eb)
---

diff --git a/src/librbd/journal/Policy.h b/src/librbd/journal/Policy.h
index 85373cd1abc5..2ef21e6fe0e8 100644
--- a/src/librbd/journal/Policy.h
+++ b/src/librbd/journal/Policy.h
@@ -16,7 +16,6 @@ struct Policy {
 
   virtual bool append_disabled() const = 0;
   virtual void allocate_tag_on_lock(Context *on_finish) = 0;
-  virtual void cancel_external_replay(Context *on_finish) = 0;
 };
 
 } // namespace journal
diff --git a/src/librbd/journal/StandardPolicy.cc b/src/librbd/journal/StandardPolicy.cc
index 9e718288706e..5cba7c020112 100644
--- a/src/librbd/journal/StandardPolicy.cc
+++ b/src/librbd/journal/StandardPolicy.cc
@@ -25,10 +25,5 @@ void StandardPolicy::allocate_tag_on_lock(Context *on_finish) {
   m_image_ctx->journal->allocate_local_tag(on_finish);
 }
 
-void StandardPolicy::cancel_external_replay(Context *on_finish) {
-  // external replay is only handled by rbd-mirror
-  assert(false);
-}
-
 } // namespace journal
 } // namespace librbd
diff --git a/src/librbd/journal/StandardPolicy.h b/src/librbd/journal/StandardPolicy.h
index e2b1ad7bc835..c2c997c8aecc 100644
--- a/src/librbd/journal/StandardPolicy.h
+++ b/src/librbd/journal/StandardPolicy.h
@@ -21,7 +21,6 @@ public:
     return false;
   }
   virtual void allocate_tag_on_lock(Context *on_finish);
-  virtual void cancel_external_replay(Context *on_finish);
 
 private:
   ImageCtx *m_image_ctx;
diff --git a/src/test/librbd/mock/MockJournalPolicy.h b/src/test/librbd/mock/MockJournalPolicy.h
index c10fd6fbf1f8..8ad6ff60952e 100644
--- a/src/test/librbd/mock/MockJournalPolicy.h
+++ b/src/test/librbd/mock/MockJournalPolicy.h
@@ -13,7 +13,6 @@ struct MockJournalPolicy : public journal::Policy {
 
   MOCK_CONST_METHOD0(append_disabled, bool());
   MOCK_METHOD1(allocate_tag_on_lock, void(Context*));
-  MOCK_METHOD1(cancel_external_replay, void(Context*));
 
 };
 
diff --git a/src/tools/rbd_mirror/ImageDeleter.cc b/src/tools/rbd_mirror/ImageDeleter.cc
index 7c5caee640a2..234c2401ffde 100644
--- a/src/tools/rbd_mirror/ImageDeleter.cc
+++ b/src/tools/rbd_mirror/ImageDeleter.cc
@@ -81,10 +81,6 @@ struct DeleteJournalPolicy : public librbd::journal::Policy {
   virtual void allocate_tag_on_lock(Context *on_finish) {
     on_finish->complete(0);
   }
-
-  virtual void cancel_external_replay(Context *on_finish) {
-    on_finish->complete(0);
-  }
 };
 
 } // anonymous namespace
diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
index 0286e522664c..f023f39ac6d7 100644
--- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
@@ -52,13 +52,6 @@ struct MirrorJournalPolicy : public librbd::journal::Policy {
     // rbd-mirror will manually create tags by copying them from the peer
     work_queue->queue(on_finish, 0);
   }
-
-  virtual void cancel_external_replay(Context *on_finish) {
-    // TODO: journal is being closed due to a comms error.  This means
-    // the journal is being closed and the exclusive lock is being released.
-    // ImageReplayer needs to restart.
-  }
-
 };
 
 } // anonymous namespace