import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / mds / MDCache.h

diff --git a/ceph/src/mds/MDCache.h b/ceph/src/mds/MDCache.h
index 9cd83419d9e3fe5e47182b42ce8502709dad3cc9..5b0b361b4ffeacecbdfc4cc3640032f516e9c86f 100644 (file)
--- a/ceph/src/mds/MDCache.h
+++ b/ceph/src/mds/MDCache.h
@@ -775,9 +775,7 @@ public:
  public:
   explicit MDCache(MDSRank *m, PurgeQueue &purge_queue_);
   ~MDCache();
-  void handle_conf_change(const ConfigProxy& conf,
-                          const std::set <std::string> &changed,
-                          const MDSMap &mds_map);
+  void handle_conf_change(const std::set<std::string>& changed, const MDSMap& mds_map);
   
   // debug
   void log_stat();
@@ -1331,6 +1329,7 @@ private:
   ceph::mutex upkeep_mutex = ceph::make_mutex("MDCache::upkeep_mutex");
   ceph::condition_variable upkeep_cvar;
   time upkeep_last_trim = time::min();
+  time upkeep_last_release = time::min();
   std::atomic<bool> upkeep_trim_shutdown{false};
 };