]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
TrackedOp: just make CephContext member public
authorGreg Farnum <greg@inktank.com>
Wed, 2 Oct 2013 22:36:38 +0000 (15:36 -0700)
committerGreg Farnum <greg@inktank.com>
Wed, 2 Oct 2013 22:36:38 +0000 (15:36 -0700)
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>
src/common/TrackedOp.h

index c098c4b017046c194ee0bfcfa7c03235df3b5108..88c3cb632a00d360c33d68410aa86586cd91e1eb 100644 (file)
@@ -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);