[PATCH 3/4] xfs: move the remaining content from xfs.h to xfs_platform.h

[Christoph Hellwig <hch@lst.de>]

Move the global defines from xfs.h to xfs_platform.h to prepare for
removing xfs.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs.h          | 17 -----------------
 fs/xfs/xfs_platform.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index b335a471c088..3ec52f2ec4b2 100644
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -6,23 +6,6 @@
 #ifndef __XFS_H__
 #define __XFS_H__
 
-#ifdef CONFIG_XFS_DEBUG
-#define DEBUG 1
-#endif
-
-#ifdef CONFIG_XFS_DEBUG_EXPENSIVE
-#define DEBUG_EXPENSIVE 1
-#endif
-
-#ifdef CONFIG_XFS_ASSERT_FATAL
-#define XFS_ASSERT_FATAL 1
-#endif
-
-#ifdef CONFIG_XFS_WARN
-#define XFS_WARN 1
-#endif
-
-
 #include "xfs_platform.h"
 
 #endif	/* __XFS_H__ */
diff --git a/fs/xfs/xfs_platform.h b/fs/xfs/xfs_platform.h
index 5223fe567ac1..c7b013593646 100644
--- a/fs/xfs/xfs_platform.h
+++ b/fs/xfs/xfs_platform.h
@@ -57,6 +57,22 @@
 #include <asm/byteorder.h>
 #include <linux/unaligned.h>
 
+#ifdef CONFIG_XFS_DEBUG
+#define DEBUG 1
+#endif
+
+#ifdef CONFIG_XFS_DEBUG_EXPENSIVE
+#define DEBUG_EXPENSIVE 1
+#endif
+
+#ifdef CONFIG_XFS_ASSERT_FATAL
+#define XFS_ASSERT_FATAL 1
+#endif
+
+#ifdef CONFIG_XFS_WARN
+#define XFS_WARN 1
+#endif
+
 /*
  * Kernel specific type declarations for XFS
  */
-- 
2.47.3