From: Greg Farnum <greg@inktank.com>
Date: Wed, 2 Oct 2013 22:36:38 +0000 (-0700)
Subject: TrackedOp: just make CephContext member public
X-Git-Tag: v0.72-rc1~93^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8761a5aa5003ab72655e393f7d418f1f95eec1d;p=ceph.git

TrackedOp: just make CephContext member public

This is the only reason we were making OpRequest a friend class, which
is just a bad idea.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index c098c4b0170..88c3cb632a0 100644
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -52,17 +52,14 @@ class OpTracker {
     void operator()(TrackedOp *op);
   };
   friend class RemoveOnDelete;
-  friend class OpRequest;
   friend class OpHistory;
   uint64_t seq;
   Mutex ops_in_flight_lock;
   xlist<TrackedOp *> ops_in_flight;
   OpHistory history;
 
-protected:
-  CephContext *cct;
-
 public:
+  CephContext *cct;
   OpTracker(CephContext *cct_) : seq(0), ops_in_flight_lock("OpTracker mutex"), history(this), cct(cct_) {}
   void dump_ops_in_flight(Formatter *f);
   void dump_historic_ops(Formatter *f);