From d2dfe8b607480bbfb318c99d5d4278a79a999a03 Mon Sep 17 00:00:00 2001
From: cxwshawn <cxwshawn@gmail.com>
Date: Sun, 22 May 2016 15:04:46 +0800
Subject: [PATCH] client: optimize header file dependency.

same work as https://github.com/ceph/ceph/pull/9247

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
---
 src/client/Client.cc     | 14 +-------------
 src/client/Client.h      | 11 ++---------
 src/client/Inode.h       |  2 +-
 src/client/MetaRequest.h |  3 ---
 src/client/MetaSession.h |  6 ++----
 src/client/barrier.cc    |  4 ----
 src/client/barrier.h     | 16 ----------------
 7 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index f2d9c4fdd0877..d000d2386ae7e 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -41,17 +41,10 @@
 
 #include <sys/statvfs.h>
 
-#include <iostream>
-using namespace std;
-
 #include "common/config.h"
-
 #include "common/version.h"
 
 // ceph stuff
-
-#include "messages/MMonMap.h"
-
 #include "messages/MClientSession.h"
 #include "messages/MClientReconnect.h"
 #include "messages/MClientRequest.h"
@@ -63,9 +56,7 @@ using namespace std;
 #include "messages/MCommandReply.h"
 #include "messages/MOSDMap.h"
 #include "messages/MClientQuota.h"
-
-#include "messages/MGenericMessage.h"
-
+#include "messages/MClientCapRelease.h"
 #include "messages/MMDSMap.h"
 #include "messages/MFSMap.h"
 
@@ -73,10 +64,7 @@ using namespace std;
 
 #include "mds/flock.h"
 #include "osd/OSDMap.h"
-#include "mon/MonMap.h"
-
 #include "osdc/Filer.h"
-#include "osdc/WritebackHandler.h"
 
 #include "common/Cond.h"
 #include "common/Mutex.h"
diff --git a/src/client/Client.h b/src/client/Client.h
index d912db05c058e..0d6de03ca1202 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -19,30 +19,21 @@
 #include "include/types.h"
 
 // stl
-#include <functional>
 #include <string>
 #include <memory>
 #include <set>
 #include <map>
 #include <fstream>
-#include <exception>
 using std::set;
 using std::map;
 using std::fstream;
 
 #include "include/unordered_set.h"
 #include "include/unordered_map.h"
-
 #include "include/filepath.h"
 #include "include/interval_set.h"
 #include "include/lru.h"
-
-//#include "barrier.h"
-
 #include "mds/mdstypes.h"
-#include "mds/MDSMap.h"
-
-#include "msg/Message.h"
 #include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
 
@@ -79,6 +70,8 @@ class Objecter;
 class WritebackHandler;
 
 class PerfCounters;
+class MDSMap;
+class Message;
 
 enum {
   l_c_first = 20000,
diff --git a/src/client/Inode.h b/src/client/Inode.h
index c92b103a15af8..67128c5afa5d6 100644
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -6,7 +6,6 @@
 
 #include "include/types.h"
 #include "include/xlist.h"
-#include "include/filepath.h"
 
 #include "mds/mdstypes.h" // hrm
 
@@ -24,6 +23,7 @@ struct Inode;
 class ceph_lock_state_t;
 class MetaRequest;
 class UserGroups;
+class filepath;
 
 struct Cap {
   MetaSession *session;
diff --git a/src/client/MetaRequest.h b/src/client/MetaRequest.h
index 8098a0fcbb487..07f4899a15607 100644
--- a/src/client/MetaRequest.h
+++ b/src/client/MetaRequest.h
@@ -6,15 +6,12 @@
 
 
 #include "include/types.h"
-#include "msg/msg_types.h"
 #include "include/xlist.h"
 #include "include/filepath.h"
 #include "include/atomic.h"
 #include "mds/mdstypes.h"
 #include "InodeRef.h"
 
-#include "common/Mutex.h"
-
 #include "messages/MClientRequest.h"
 
 class MClientReply;
diff --git a/src/client/MetaSession.h b/src/client/MetaSession.h
index 2eb8cd6d82bde..41cd4d09ad293 100644
--- a/src/client/MetaSession.h
+++ b/src/client/MetaSession.h
@@ -6,11 +6,9 @@
 
 #include "include/types.h"
 #include "include/utime.h"
-#include "msg/msg_types.h"
+#include "msg/Message.h"
 #include "include/xlist.h"
-
-#include "messages/MClientCapRelease.h"
-#include "mds/MDSMap.h"
+#include "mds/mdstypes.h"
 
 struct Cap;
 struct Inode;
diff --git a/src/client/barrier.cc b/src/client/barrier.cc
index fdbd8b26bf900..8e5dfeb9c8c21 100644
--- a/src/client/barrier.cc
+++ b/src/client/barrier.cc
@@ -15,12 +15,8 @@
 #include <sys/param.h>
 #endif
 
-#include <iostream>
-using namespace std;
-
 #include "include/Context.h"
 #include "Client.h"
-#include "common/config.h"
 #include "barrier.h"
 #include "include/assert.h"
 
diff --git a/src/client/barrier.h b/src/client/barrier.h
index 25e2e2cbd4b6d..951ceb0958a9c 100644
--- a/src/client/barrier.h
+++ b/src/client/barrier.h
@@ -15,27 +15,11 @@
 #define BARRIER_H
 
 #include "include/types.h"
-
-#include <string>
-#include <list>
-#include <set>
-#include <map>
 #include <boost/intrusive/list.hpp>
 #define BOOST_ICL_USE_STATIC_BOUNDED_INTERVALS
 #include <boost/icl/interval_set.hpp>
-#include <fstream>
-#include <exception>
-
-using std::list;
-using std::set;
-using std::map;
-using std::fstream;
-
-#include <ext/hash_map>
-
 #include "common/Mutex.h"
 #include "common/Cond.h"
-#include "common/config.h"
 
 class Client;
 
-- 
2.39.5