Commit ddcd856d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] fix compile on 32 bit systems 



The recent compat patches make xfs_file.c include xfs_ioctl32.h unconditional,
which breaks the build on 32 bit systems which don't have the various compat
defintions.

Remove the include and move the defintion of xfs_file_compat_ioctl to
xfs_ioctl.h so that we can avoid including all the compat defintions in
xfs_file.c

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent e5d412f1

fs/xfs/linux-2.6/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ 
#include "xfs_inode.h"

#include "xfs_error.h"

#include "xfs_rw.h"

#include "xfs_ioctl32.h"

#include "xfs_vnodeops.h"

#include "xfs_da_btree.h"

#include "xfs_ioctl.h"



#include <linux/dcache.h>

#include <linux/smp_lock.h>

fs/xfs/linux-2.6/xfs_ioctl.h

+12 −0
Original line number Diff line number Diff line
@@ -67,4 +67,16 @@ xfs_attrmulti_attr_remove( 
	char			*name,

	__uint32_t		flags);



extern long

xfs_file_compat_ioctl(

	struct file		*file,

	unsigned int		cmd,

	unsigned long		arg);



extern long

xfs_file_compat_ioctl_invis(

	struct file		*file,

	unsigned int		cmd,

	unsigned long		arg);



#endif

fs/xfs/linux-2.6/xfs_ioctl32.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 


#include <linux/compat.h>



extern long xfs_file_compat_ioctl(struct file *, unsigned, unsigned long);

extern long xfs_file_compat_invis_ioctl(struct file *, unsigned, unsigned long);



/*

 * on 32-bit arches, ioctl argument structures may have different sizes

 * and/or alignment.  We define compat structures which match the

CRA Git | Maintained and supported by SUSTech CRA and CCSE