Commit 06f8e2d6 authored by Alex Elder's avatar Alex Elder
Browse files

xfs: don't expect xfs headers to be in subdirectories 



Fix up some #include directives in preparation for moving a few
header files out of xfs source subdirectories.

Note that "xfs_linux.h" also got its quoting convention for included
files switched.

Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent e5702805

fs/xfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

#



ccflags-y := -I$(src) -I$(src)/linux-2.6

ccflags-y := -I$(src) -I$(src)/linux-2.6 -I$(src)/quota -I$(src)/support

ccflags-$(CONFIG_XFS_DEBUG) += -g



XFS_LINUX := linux-2.6

fs/xfs/linux-2.6/xfs_linux.h

+13 −14
Original line number Diff line number Diff line
@@ -32,13 +32,12 @@ 
# define XFS_BIG_INUMS	0

#endif



#include <xfs_types.h>

#include "xfs_types.h"



#include <kmem.h>

#include <mrlock.h>

#include <time.h>



#include <support/uuid.h>

#include "kmem.h"

#include "mrlock.h"

#include "time.h"

#include "uuid.h"



#include <linux/semaphore.h>

#include <linux/mm.h>
@@ -78,14 +77,14 @@ 
#include <asm/byteorder.h>

#include <asm/unaligned.h>



#include <xfs_vnode.h>

#include <xfs_stats.h>

#include <xfs_sysctl.h>

#include <xfs_iops.h>

#include <xfs_aops.h>

#include <xfs_super.h>

#include <xfs_buf.h>

#include <xfs_message.h>

#include "xfs_vnode.h"

#include "xfs_stats.h"

#include "xfs_sysctl.h"

#include "xfs_iops.h"

#include "xfs_aops.h"

#include "xfs_super.h"

#include "xfs_buf.h"

#include "xfs_message.h"



#ifdef __BIG_ENDIAN

#define XFS_NATIVE_HOST 1

fs/xfs/linux-2.6/xfs_quotaops.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "xfs_trans.h"

#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "quota/xfs_qm.h"

#include "xfs_qm.h"

#include <linux/quota.h>

fs/xfs/linux-2.6/xfs_trace.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
#include "xfs_quota.h"

#include "xfs_iomap.h"

#include "xfs_aops.h"

#include "quota/xfs_dquot_item.h"

#include "quota/xfs_dquot.h"

#include "xfs_dquot_item.h"

#include "xfs_dquot.h"

#include "xfs_log_recover.h"

#include "xfs_inode_item.h"

fs/xfs/xfs.h

+2 −1
Original line number Diff line number Diff line
@@ -24,5 +24,6 @@ 
#define XFS_BUF_LOCK_TRACKING 1

#endif



#include <linux-2.6/xfs_linux.h>

#include "xfs_linux.h"



#endif	/* __XFS_H__ */