[XFS] Sync up some missing header updates from local XFS tree.

diff --git a/fs/xfs/linux/xfs_linux.h b/fs/xfs/linux/xfs_linux.h
index 1cf06f8ec8ff55b9c4cfd6d8c9311bc3e89662ea..c6631b45d6af6a28aa714e199d64fab0ced0090e 100644 (file)
--- a/fs/xfs/linux/xfs_linux.h
+++ b/fs/xfs/linux/xfs_linux.h
@@ -32,6 +32,44 @@
 #ifndef __XFS_LINUX__
 #define __XFS_LINUX__
 
+#include <linux/types.h>
+#include <linux/config.h>
+
+/*
+ * Some types are conditional depending on the target system.
+ * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits.
+ * XFS_BIG_INUMS needs the VFS inode number to be 64 bits, as well
+ * as requiring XFS_BIG_BLKNOS to be set.
+ */
+#if defined(CONFIG_LBD) || (BITS_PER_LONG == 64)
+# define XFS_BIG_BLKNOS        1
+# if BITS_PER_LONG == 64
+#  define XFS_BIG_INUMS        1
+# else
+#  define XFS_BIG_INUMS        0
+# endif
+#else
+# define XFS_BIG_BLKNOS        0
+# define XFS_BIG_INUMS 0
+#endif
+
+#include <xfs_types.h>
+#include <xfs_arch.h>
+
+#include <kmem.h>
+#include <mrlock.h>
+#include <spin.h>
+#include <sv.h>
+#include <mutex.h>
+#include <sema.h>
+#include <time.h>
+
+#include <support/qsort.h>
+#include <support/ktrace.h>
+#include <support/debug.h>
+#include <support/move.h>
+#include <support/uuid.h>
+
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -55,14 +93,6 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 
-#include <mrlock.h>
-#include <spin.h>
-#include <sv.h>
-#include <mutex.h>
-#include <sema.h>
-#include <time.h>
-#include <kmem.h>
-
 #include <xfs_behavior.h>
 #include <xfs_vfs.h>
 #include <xfs_cred.h>

diff --git a/fs/xfs/support/uuid.c b/fs/xfs/support/uuid.c
index 7e44857648ab8beab8b9b49301e8d14b5d7e9429..81f40cfcb2679af90f9b6af6d6f9b3a5070097d8 100644 (file)
--- a/fs/xfs/support/uuid.c
+++ b/fs/xfs/support/uuid.c
@@ -30,14 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <linux/types.h>
-#include <xfs_types.h>
-#include <xfs_arch.h>
-#include <time.h>
-#include <kmem.h>
-#include <mutex.h>
-#include "uuid.h"
-#include "debug.h"
+#include <xfs.h>
 
 static mutex_t uuid_monitor;
 static int     uuid_table_size;

diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index d916806daf77308480f52aaff898a6721959783e..0e9354961621e8d27e1905c590888f002543f42a 100644 (file)
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -32,21 +32,8 @@
 #ifndef __XFS_H__
 #define __XFS_H__
 
-#include <linux/types.h>
-#include <linux/config.h>
-#include <xfs_types.h>
-
-#include <xfs_arch.h>
-
-#include <support/qsort.h>
-#include <support/ktrace.h>
-#include <support/debug.h>
-#include <support/move.h>
-#include <support/uuid.h>
-
 #include <linux/xfs_linux.h>
 
 #include <xfs_fs.h> 
-#include <xfs_buf.h>
 
 #endif /* __XFS_H__ */

diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 9ba24c9e9dadb48732c46fdf82e062ca8b7400e2..8d6aac75047cc4edba8f5ba71267a7f889870647 100644 (file)
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -75,24 +75,6 @@ typedef __uint64_t __psunsigned_t;
 #error BITS_PER_LONG must be 32 or 64
 #endif
 
-/*
- * Some types are conditional depending on the target system.
- * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits.
- * XFS_BIG_INUMS needs the VFS inode number to be 64 bits, as well
- * as requiring XFS_BIG_BLKNOS to be set.
- */
-#if defined(CONFIG_LBD) || (BITS_PER_LONG == 64)
-# define XFS_BIG_BLKNOS        1
-# if BITS_PER_LONG == 64
-#  define XFS_BIG_INUMS        1
-# else
-#  define XFS_BIG_INUMS        0
-# endif
-#else
-# define XFS_BIG_BLKNOS        0
-# define XFS_BIG_INUMS 0
-#endif
-
 #endif /* __KERNEL__ */
 
 typedef __uint32_t     xfs_agblock_t;  /* blockno in alloc. group */