From: Michal Jarzabek Date: Wed, 14 Sep 2016 17:39:22 +0000 (+0100) Subject: osd/OSD.h: make some members private X-Git-Tag: v11.0.1~236^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11085%2Fhead;p=ceph.git osd/OSD.h: make some members private Signed-off-by: Michal Jarzabek --- diff --git a/src/osd/OSD.h b/src/osd/OSD.h index a0a938962ad0..0cf568d4c81c 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -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