From: Sage Weil <sage@newdream.net>
Date: Wed, 22 Oct 2008 17:54:44 +0000 (-0700)
Subject: kclient: remove remaining #include/#ifdef cruft from ceph_fs.h
X-Git-Tag: v0.5~219
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a53c85c1fa9b5ecda66efc106b0ce46f393c91ee;p=ceph.git

kclient: remove remaining #include/#ifdef cruft from ceph_fs.h
---

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 3ee1c8e3de31..3b4ce0456c27 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -1,27 +1,26 @@
-/* ceph_fs.h
+/*
+ * ceph_fs.h - Ceph constants and data types to share between kernel and
+ * user space.
  *
- * C data types to share between kernel and userspace.
+ * LGPL2
  */
 
 #ifndef _FS_CEPH_CEPH_FS_H
 #define _FS_CEPH_CEPH_FS_H
 
-#ifdef __KERNEL__
-# include <linux/in.h>
-# include <linux/types.h>
-# include <asm/fcntl.h>
-# include <linux/string.h>
-#endif
-
 
 #define CEPH_MON_PORT 12345
-#define CEPH_FILE_MAX_SIZE (1ULL << 40) /* 1 TB */
 
+/*
+ * Max file size is a policy choice; in reality we are limited
+ * by 2^64.
+ */
+#define CEPH_FILE_MAX_SIZE (1ULL << 40)   /* 1 TB */
 
 /*
  * tcp connection banner.  include a protocol version. and adjust
- * whenever the wire protocol changes.  try to keep this string the
- * same length.
+ * whenever the wire protocol changes.  try to keep this string length
+ * constant.
  */
 #define CEPH_BANNER "ceph 004\n"
 #define CEPH_BANNER_MAX_LEN 30
diff --git a/src/kernel/ioctl.h b/src/kernel/ioctl.h
index 3420a8cdeb8a..537c27bf05c0 100644
--- a/src/kernel/ioctl.h
+++ b/src/kernel/ioctl.h
@@ -2,7 +2,7 @@
 #define FS_CEPH_IOCTL_H
 
 #include <linux/ioctl.h>
-#include "ceph_fs.h"
+#include "types.h"
 
 #define CEPH_IOCTL_MAGIC 0x97
 
diff --git a/src/kernel/mdsmap.h b/src/kernel/mdsmap.h
index 6ac39a452617..e7a06ea911e4 100644
--- a/src/kernel/mdsmap.h
+++ b/src/kernel/mdsmap.h
@@ -1,7 +1,7 @@
 #ifndef _FS_CEPH_MDSMAP_H
 #define _FS_CEPH_MDSMAP_H
 
-#include "ceph_fs.h"
+#include "types.h"
 
 /*
  * mds map
diff --git a/src/kernel/messenger.h b/src/kernel/messenger.h
index 34de075c1369..12097097df44 100644
--- a/src/kernel/messenger.h
+++ b/src/kernel/messenger.h
@@ -9,7 +9,7 @@
 #include <linux/version.h>
 #include <linux/workqueue.h>
 
-#include "ceph_fs.h"
+#include "types.h"
 
 /*
  * Ceph uses the messenger to exchange ceph_msg messages with
diff --git a/src/kernel/osd_client.h b/src/kernel/osd_client.h
index 2e16a81e852c..18e36aa1905b 100644
--- a/src/kernel/osd_client.h
+++ b/src/kernel/osd_client.h
@@ -4,7 +4,6 @@
 #include <linux/radix-tree.h>
 #include <linux/completion.h>
 
-#include "ceph_fs.h"
 #include "types.h"
 #include "osdmap.h"
 
diff --git a/src/kernel/osdmap.h b/src/kernel/osdmap.h
index ba00e83f3ac3..032216e367ad 100644
--- a/src/kernel/osdmap.h
+++ b/src/kernel/osdmap.h
@@ -1,7 +1,7 @@
 #ifndef _FS_CEPH_OSDMAP_H
 #define _FS_CEPH_OSDMAP_H
 
-#include "ceph_fs.h"
+#include "types.h"
 #include "crush/crush.h"
 
 /*
diff --git a/src/kernel/super.h b/src/kernel/super.h
index 23b1d313f8a6..656ba0945a1e 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -10,9 +10,8 @@
 #include <linux/sysfs.h>
 #include <linux/backing-dev.h>
 
-#include "ceph_fs.h"
-#include "ceph_debug.h"
 #include "types.h"
+#include "ceph_debug.h"
 #include "messenger.h"
 #include "mon_client.h"
 #include "mds_client.h"
diff --git a/src/kernel/types.h b/src/kernel/types.h
index 3963f0cab219..ce6eeed9b0f8 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -1,6 +1,14 @@
 #ifndef _FS_CEPH_TYPES_H
 #define _FS_CEPH_TYPES_H
 
+/* needed before including ceph_fs.h */
+#include <linux/in.h>
+#include <linux/types.h>
+#include <asm/fcntl.h>
+#include <linux/string.h>
+
+#include "ceph_fs.h"
+
 /*
  * Identify inodes by both their ino and snapshot id (a u64).
  */