kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[XFS] fix compile on 32 bit systems

Browse source 
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: Christoph Hellwig <hch@lst.de>
Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig 2008-12-03 07:55:34 -05:00 committed by Lachlan McIlroy
parent e5d412f178
commit ddcd856d81
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_file.c
View file

@ -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>

12
fs/xfs/linux-2.6/xfs_ioctl.h
View file

@ -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

3
fs/xfs/linux-2.6/xfs_ioctl32.h
View file

@ -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