Merge pull request #11085 from stiopaa1/osd_osd_moveUnderPrivate

osd/OSD.h: make some members private
ceph · Sep 14, 2016 · 9096ad3 · 9096ad3
2 parents ca74bd9 + 6f274ec
commit 9096ad3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
@@ -1181,6 +1181,12 @@ class OSDService {
 class OSD : public Dispatcher,
 	    public md_config_obs_t {
   /** OSD **/
+  Mutex osd_lock;			// global lock
+  SafeTimer tick_timer;    // safe timer (osd_lock)
+
+  // Tick timer for those stuff that do not need osd_lock
+  Mutex tick_timer_lock;
+  SafeTimer tick_timer_without_osd_lock;
 public:
   // config observer bits
   virtual const char** get_tracked_conf_keys() const;
@@ -1190,12 +1196,6 @@ class OSD : public Dispatcher,
   void check_config();
 
 protected:
-  Mutex osd_lock;			// global lock
-  SafeTimer tick_timer;    // safe timer (osd_lock)
-
-  // Tick timer for those stuff that do not need osd_lock
-  Mutex tick_timer_lock;
-  SafeTimer tick_timer_without_osd_lock;
 
   static const double OSD_TICK_INTERVAL; // tick interval for tick_timer and tick_timer_without_osd_lock