]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[XFS] fix compile on 32 bit systems
authorChristoph Hellwig <hch@infradead.org>
Wed, 3 Dec 2008 12:55:34 +0000 (07:55 -0500)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Thu, 4 Dec 2008 02:07:29 +0000 (13:07 +1100)
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>
fs/xfs/linux-2.6/xfs_file.c
fs/xfs/linux-2.6/xfs_ioctl.h
fs/xfs/linux-2.6/xfs_ioctl32.h

index 72fc8d8c8bc197994adb27c3751b2c56987b5932..d377db05d806473f6099697f182c8f94459d03cd 100644 (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>
index f67dc69381e88333e8a23cccfa6e64508a591ef4..a3446aad070ac5a35d5ad16c15a70fe67d6540a3 100644 (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
index af918749d1869d519a1839fcc6fd4c30fd992bba..1024c4f8ba0d4501d296d3076c9d6ada00dda9d8 100644 (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