summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Farnum <greg@inktank.com>2013-10-02 15:36:38 -0700
committerGreg Farnum <greg@inktank.com>2013-10-02 15:36:38 -0700
commita8761a5aa5003ab72655e393f7d418f1f95eec1d (patch)
tree6da31252cedbe047b67db45ed045455463d7769a
parent2723a09aba868b9357a042438bc26bc4fd6ef94f (diff)
downloadceph-a8761a5aa5003ab72655e393f7d418f1f95eec1d.tar.gz
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>
-rw-r--r--src/common/TrackedOp.h5
1 files changed, 1 insertions, 4 deletions
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);