Merge pull request ceph#26219 from yaozongyou/mon-cleanups

mon: some tiny cleanups related class forward declaration Reviewed-by: Kefu Chai <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
JiYou · Feb 27, 2019 · bde0ea9 · bde0ea9
2 parents bc9ac5a + d518714
commit bde0ea9
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 33 deletions.
diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
@@ -24,9 +24,7 @@
 #include "mon/PaxosService.h"
 #include "mon/MonitorDBStore.h"
 
-class MMonCommand;
 struct MAuth;
-struct MMonGlobalID;
 class KeyRing;
 class Monitor;
 

diff --git a/src/mon/ConfigKeyService.h b/src/mon/ConfigKeyService.h
@@ -19,9 +19,6 @@
 
 class Paxos;
 class Monitor;
-namespace ceph {
-class Formatter;
-}
 
 class ConfigKeyService : public QuorumService
 {

diff --git a/src/mon/HealthMonitor.h b/src/mon/HealthMonitor.h
@@ -16,9 +16,6 @@
 
 #include "mon/PaxosService.h"
 
-//forward declaration
-namespace ceph { class Formatter; }
-
 class HealthMonitor : public PaxosService
 {
   version_t version = 0;

diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
@@ -25,7 +25,6 @@
 #include "common/LogEntry.h"
 #include "include/str_map.h"
 
-class MMonCommand;
 class MLog;
 
 static const string LOG_META_CHANNEL = "$channel";

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
@@ -27,9 +27,6 @@
 #include "msg/Messenger.h"
 #include "messages/MMDSBeacon.h"
 
-class MMonCommand;
-class MMDSLoadTargets;
-class MMDSMap;
 class FileSystemCommandHandler;
 
 class MDSMonitor : public PaxosService, public PaxosFSMap {

diff --git a/src/mon/MgrMonitor.h b/src/mon/MgrMonitor.h
@@ -127,8 +127,6 @@ class MgrMonitor: public PaxosService
   void count_metadata(const string& field, Formatter *f);
   void count_metadata(const string& field, std::map<string,int> *out);
 
-  friend class C_Updated;
-
   // When did the mon last call into our tick() method?  Used for detecting
   // when the mon was not updating us for some period (e.g. during slow
   // election) to reset last_beacon timeouts

diff --git a/src/mon/MgrStatMonitor.h b/src/mon/MgrStatMonitor.h
@@ -104,6 +104,4 @@ class MgrStatMonitor : public PaxosService {
 		       bool verbose) const {
     digest.dump_pool_stats_full(osdm, ss, f, verbose);
   }
-
-  friend class C_Updated;
 };
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
@@ -34,7 +34,6 @@ class MMonGetVersionReply;
 struct MMonSubscribeAck;
 class MMonCommandAck;
 struct MAuthReply;
-class MAuthRotating;
 class LogClient;
 class AuthAuthorizer;
 class AuthClientHandler;

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
@@ -102,18 +102,6 @@ class PaxosService;
 class PerfCounters;
 class AdminSocketHook;
 
-class MMonGetMap;
-class MMonGetVersion;
-class MMonMetadata;
-class MMonSync;
-class MMonScrub;
-class MMonProbe;
-struct MMonSubscribe;
-struct MRoute;
-struct MForward;
-struct MTimeCheck2;
-struct MMonHealth;
-
 #define COMPAT_SET_LOC "feature_set"
 
 class C_MonContext final : public FunctionContext {

diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
@@ -29,10 +29,6 @@
 #include "MonMap.h"
 #include "MonitorDBStore.h"
 
-class MMonMap;
-class MMonCommand;
-class MMonJoin;
-
 class MonmapMonitor : public PaxosService {
  public:
   MonmapMonitor(Monitor *mn, Paxos *p, const string& service_name)