---

yaml --- r: 124921 b: refs/heads/master c: ddcd856 h: refs/heads/master i: 124919: 85eb690 v: v3
git-mirror · Dec 4, 2008 · aa8f661 · aa8f661
1 parent 0750b79
commit aa8f661
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5d412f17846b0aea9e5250926f994ab2e4e1006
+refs/heads/master: ddcd856d81861a523d79d077facd875da1f66792
diff --git a/trunk/fs/xfs/linux-2.6/xfs_file.c b/trunk/fs/xfs/linux-2.6/xfs_file.c
@@ -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>

diff --git a/trunk/fs/xfs/linux-2.6/xfs_ioctl.h b/trunk/fs/xfs/linux-2.6/xfs_ioctl.h
@@ -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
diff --git a/trunk/fs/xfs/linux-2.6/xfs_ioctl32.h b/trunk/fs/xfs/linux-2.6/xfs_ioctl32.h
@@ -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