From: Samuel Just <sjust@redhat.com>
Date: Tue, 31 May 2016 22:28:24 +0000 (-0700)
Subject: PG.h: remove some unnecessary virtual declarations
X-Git-Tag: v13.0.1~573^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b912def13ee36f95ee0a0d4e1c9c54983bfafcc5;p=ceph.git

PG.h: remove some unnecessary virtual declarations

PG users do not need these public methods.

Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 3cb5c30d0575..050e9054e175 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2706,12 +2706,6 @@ protected:
 
 
   // abstract bits
-  virtual void do_op(OpRequestRef& op) = 0;
-  virtual void do_scan(
-    OpRequestRef op,
-    ThreadPool::TPHandle &handle
-  ) = 0;
-  virtual void do_backfill(OpRequestRef op) = 0;
 
   virtual void on_role_change() = 0;
   virtual void on_pool_change() = 0;
diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index c70e44b4108b..8606fc4f694a 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -1394,14 +1394,16 @@ public:
   void do_request(
     OpRequestRef& op,
     ThreadPool::TPHandle &handle) override;
-  void do_op(OpRequestRef& op) override;
+  void do_op(OpRequestRef& op);
   void record_write_error(OpRequestRef op, const hobject_t &soid,
 			  MOSDOpReply *orig_reply, int r);
   void do_pg_op(OpRequestRef op);
+  void do_sub_op(OpRequestRef op);
+  void do_sub_op_reply(OpRequestRef op);
   void do_scan(
     OpRequestRef op,
-    ThreadPool::TPHandle &handle) override;
-  void do_backfill(OpRequestRef op) override;
+    ThreadPool::TPHandle &handle);
+  void do_backfill(OpRequestRef op);
   void do_backfill_remove(OpRequestRef op);
 
   void handle_backoff(OpRequestRef& op);