]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD.h: make some members private 11085/head
authorMichal Jarzabek <stiopa@gmail.com>
Wed, 14 Sep 2016 17:39:22 +0000 (18:39 +0100)
committerMichal Jarzabek <stiopa@gmail.com>
Wed, 14 Sep 2016 17:39:22 +0000 (18:39 +0100)
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
src/osd/OSD.h

index a0a938962ad0603bf43ab8ec11d0306aafae107c..0cf568d4c81c173c65cdcb1280b60df92475c19e 100644 (file)
@@ -1181,6 +1181,12 @@ public:
 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 @@ public:
   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