summaryrefslogtreecommitdiff
path: root/src/mds/Migrator.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mds/Migrator.cc')
-rw-r--r--src/mds/Migrator.cc35
1 files changed, 15 insertions, 20 deletions
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index d0ef16b2793..a96f5442f5e 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -11,21 +11,12 @@
* Foundation. See file COPYING.
*
*/
-
-#include "MDS.h"
-#include "MDCache.h"
-#include "CInode.h"
-#include "CDir.h"
-#include "CDentry.h"
-#include "Migrator.h"
-#include "Locker.h"
-#include "Server.h"
-
-#include "MDBalancer.h"
-#include "MDLog.h"
-#include "MDSMap.h"
+#include "mds_types.h"
#include "include/filepath.h"
+#include "common/config.h"
+#include "msg/Messenger.h"
+#include "global/debug.h"
#include "events/EString.h"
#include "events/EExport.h"
@@ -33,10 +24,7 @@
#include "events/EImportFinish.h"
#include "events/ESessions.h"
-#include "msg/Messenger.h"
-
#include "messages/MClientCaps.h"
-
#include "messages/MExportDirDiscover.h"
#include "messages/MExportDirDiscoverAck.h"
#include "messages/MExportDirCancel.h"
@@ -47,10 +35,20 @@
#include "messages/MExportDirNotify.h"
#include "messages/MExportDirNotifyAck.h"
#include "messages/MExportDirFinish.h"
-
#include "messages/MExportCaps.h"
#include "messages/MExportCapsAck.h"
+#include "MDS.h"
+#include "MDCache.h"
+#include "CInode.h"
+#include "CDir.h"
+#include "CDentry.h"
+#include "Locker.h"
+#include "Server.h"
+#include "MDBalancer.h"
+#include "MDLog.h"
+
+#include "Migrator.h"
/*
* this is what the dir->dir_auth values look like
@@ -72,9 +70,6 @@
* - auth bit is set if i am listed as first _or_ second dir_auth.
*/
-#include "common/config.h"
-#include "global/debug.h"
-
#define dout_subsys ceph_subsys_mds
#undef DOUT_COND
#define DOUT_COND(cct, l) (l <= cct->_conf->debug_mds || l <= cct->_conf->debug_mds_migrator)