Commit 20abba2c authored by Nathan Scott's avatar Nathan Scott

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

parent 2dc45200
...@@ -32,6 +32,44 @@ ...@@ -32,6 +32,44 @@
#ifndef __XFS_LINUX__ #ifndef __XFS_LINUX__
#define __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/mm.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -55,14 +93,6 @@ ...@@ -55,14 +93,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/unaligned.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_behavior.h>
#include <xfs_vfs.h> #include <xfs_vfs.h>
#include <xfs_cred.h> #include <xfs_cred.h>
......
...@@ -30,14 +30,7 @@ ...@@ -30,14 +30,7 @@
* http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
*/ */
#include <linux/types.h> #include <xfs.h>
#include <xfs_types.h>
#include <xfs_arch.h>
#include <time.h>
#include <kmem.h>
#include <mutex.h>
#include "uuid.h"
#include "debug.h"
static mutex_t uuid_monitor; static mutex_t uuid_monitor;
static int uuid_table_size; static int uuid_table_size;
......
...@@ -32,21 +32,8 @@ ...@@ -32,21 +32,8 @@
#ifndef __XFS_H__ #ifndef __XFS_H__
#define __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 <linux/xfs_linux.h>
#include <xfs_fs.h> #include <xfs_fs.h>
#include <xfs_buf.h>
#endif /* __XFS_H__ */ #endif /* __XFS_H__ */
...@@ -75,24 +75,6 @@ typedef __uint64_t __psunsigned_t; ...@@ -75,24 +75,6 @@ typedef __uint64_t __psunsigned_t;
#error BITS_PER_LONG must be 32 or 64 #error BITS_PER_LONG must be 32 or 64
#endif #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__ */ #endif /* __KERNEL__ */
typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */ typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment