From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 19 Apr 2016 07:11:32 +0000 (+0800)
Subject: osd/ReplicatedPG: kill members we never used
X-Git-Tag: v11.0.0~840^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ad9245be1e8de550aa94229eb6370bf8c2823b4;p=ceph.git

osd/ReplicatedPG: kill members we never used

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index dfb9293c37a2..660855611c96 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -924,10 +924,6 @@ protected:
   // agent
   boost::scoped_ptr<TierAgentState> agent_state;
 
-  friend struct C_AgentFlushStartStop;
-  friend struct C_AgentEvictStartStop;
-  friend struct C_HitSetFlushing;
-
   void agent_setup();       ///< initialize agent state
   bool agent_work(int max) ///< entry point to do some agent work
   {
@@ -1297,14 +1293,6 @@ protected:
 	obc3->ondisk_write_unlock();
     }
   };
-  struct C_OSD_OndiskWriteUnlockList : public Context {
-    list<ObjectContextRef> *pls;
-    explicit C_OSD_OndiskWriteUnlockList(list<ObjectContextRef> *l) : pls(l) {}
-    void finish(int r) {
-      for (list<ObjectContextRef>::iterator p = pls->begin(); p != pls->end(); ++p)
-	(*p)->ondisk_write_unlock();
-    }
-  };
   struct C_OSD_AppliedRecoveredObject : public Context {
     ReplicatedPGRef pg;
     ObjectContextRef obc;
@@ -1416,7 +1404,6 @@ protected:
   virtual void _scrub_clear_state();
   virtual void _scrub_finish();
   object_stat_collection_t scrub_cstat;
-  friend class C_ScrubDigestUpdated;
 
   virtual void _split_into(pg_t child_pgid, PG *child, unsigned split_bits);
   void apply_and_flush_repops(bool requeue);
@@ -1448,7 +1435,6 @@ protected:
   void finish_proxy_write(hobject_t oid, ceph_tid_t tid, int r);
   void cancel_proxy_write(ProxyWriteOpRef pwop);
 
-  friend struct C_ProxyWrite_Apply;
   friend struct C_ProxyWrite_Commit;
 
 public: