clean up ceph_fs.h a bit

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 1f588d63588089859ddef5a9604a2d6da4e6f4e8..3ee1c8e3de31e7503337fa20166d021e468bba04 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -1,32 +1,19 @@
 /* ceph_fs.h
  *
- * C data types to share between kernel and userspace
+ * C data types to share between kernel and userspace.
  */
 
 #ifndef _FS_CEPH_CEPH_FS_H
 #define _FS_CEPH_CEPH_FS_H
 
-#define _BACKWARD_BACKWARD_WARNING_H   /* make gcc 4.3 shut up */
-
-
 #ifdef __KERNEL__
 # include <linux/in.h>
 # include <linux/types.h>
 # include <asm/fcntl.h>
 # include <linux/string.h>
-#else
-# include <netinet/in.h>
-# ifndef _LINUX_TYPES_H
-#  define _LINUX_TYPES_H /* we don't want linux/types.h's __u32, __le32, etc. */
-#  include "inttypes.h"
-#  include "byteorder.h"
-# endif
-# include <fcntl.h>
-# include <string.h>
 #endif
 
 
-
 #define CEPH_MON_PORT 12345
 #define CEPH_FILE_MAX_SIZE (1ULL << 40) /* 1 TB */
 

diff --git a/src/include/types.h b/src/include/types.h
index 64bc3439ea32044446b557587db5ba623acb202c..9dcec5b1f6bafe3daec927975f4d8d7e53490799 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -12,16 +12,25 @@
  * 
  */
 
-#ifndef __MDS_TYPES_H
-#define __MDS_TYPES_H
+#ifndef __CEPH_TYPES_H
+#define __CEPH_TYPES_H
+
+// this is needed for ceph_fs to compile in userland
+#include <netinet/in.h>
+#define _LINUX_TYPES_H /* we don't want linux/types.h's __u32, __le32, etc. */
+#include "inttypes.h"
+#include "byteorder.h"
+#include <fcntl.h>
+#include <string.h>
 
 #include "ceph_fs.h"
 
+#define _BACKWARD_BACKWARD_WARNING_H   /* make gcc 4.3 shut up about hash_*. */
+
 extern "C" {
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include "statlite.h"
 }
 

diff --git a/src/include/utime.h b/src/include/utime.h
index ebc34d53da94115879e74b1e3ff43bf920fffa33..3e39c5b6019884ad7c59001e1708ac1899bf0f26 100644 (file)
--- a/src/include/utime.h
+++ b/src/include/utime.h
@@ -15,10 +15,19 @@
 #ifndef __UTIME_H
 #define __UTIME_H
 
+// this is needed for ceph_fs to compile in userland
+#include <netinet/in.h>
+#define _LINUX_TYPES_H /* we don't want linux/types.h's __u32, __le32, etc. */
+#include "inttypes.h"
+#include "byteorder.h"
+#include <fcntl.h>
+#include <string.h>
+
+#include "ceph_fs.h"
+
 #include <math.h>
 #include <sys/time.h>
 #include <time.h>
-#include "ceph_fs.h"
 
 #include "buffer.h"
 #include "encoding.h"

diff --git a/src/kernel/export.c b/src/kernel/export.c
index 564807fa7f09c5d648122a4ca870cbed42b07492..2aa7d591b10049ed18824a7cf8fa1bc487fea40b 100644 (file)
--- a/src/kernel/export.c
+++ b/src/kernel/export.c
@@ -1,6 +1,5 @@
 #include <linux/exportfs.h>
 
-#include "ceph_fs.h"
 #include "super.h"
 #include "ceph_debug.h"
 

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 0c7133a942e98d87d3b396d42aae1d2b25316ea0..4a6f0b17c24bfcd5ca9bbdc405c5db0bb744200d 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -8,7 +8,6 @@
 #include <linux/namei.h>
 #include <linux/writeback.h>
 
-#include "ceph_fs.h"
 #include "ceph_debug.h"
 
 int ceph_debug_inode = -1;

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 3a9fc5dbe48b706f4a9c86086e507508e338f747..7269f23883b3523160f630511ec0e261d3fb49e6 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -5,7 +5,6 @@
 #include "mon_client.h"
 
 #include "ceph_debug.h"
-#include "ceph_fs.h"
 
 int ceph_debug_mdsc = -1;
 #define DOUT_VAR ceph_debug_mdsc

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 1d669faf2d48f99dd25052f2a918538808716798..2ab146d0c0825cd3a6cfc3eea2846d6b58ad2c81 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -6,16 +6,15 @@
 #include <linux/highmem.h>
 #include <net/tcp.h>
 
-#include "ceph_debug.h"
-
-#include "ceph_fs.h"
-#include "messenger.h"
-
 int ceph_debug_msgr;
 #define DOUT_MASK DOUT_MASK_MSGR
 #define DOUT_VAR ceph_debug_msgr
 #define DOUT_PREFIX "msgr: "
+#include "ceph_debug.h"
+
 #include "super.h"
+#include "messenger.h"
+
 
 
 /* static tag bytes (protocol control messages) */

diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index f51b5e09f62b6279aa1c455ea2dff31a460d9871..129b9539cc8abf65d4e283eb70c89f5d7f41ccf7 100644 (file)
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -3,14 +3,13 @@
 #include <linux/ctype.h>
 #include <asm/uaccess.h>
 
-#include "ceph_debug.h"
 
 int ceph_debug_proc = -1;
 #define DOUT_MASK DOUT_MASK_PROC
 #define DOUT_VAR ceph_debug_proc
 #define DOUT_PREFIX "proc: "
+#include "ceph_debug.h"
 
-#include "ceph_fs.h"
 #include "super.h"
 
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 21da4132730d38626e21b2c191c7fda18f835f04..db8884002afcdf8f592759eca4ef2c3338b664c2 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -16,7 +16,7 @@
 #define __MESSAGE_H
  
 /* public message types */
-#include "include/ceph_fs.h"
+#include "include/types.h"
 
 // monitor internal
 #define MSG_MON_ELECTION           60