From aa8f661d8dade1d5ce89c40b04db84de227bc1b7 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 3 Dec 2008 07:55:34 -0500
Subject: [PATCH] --- yaml --- r: 124921 b: refs/heads/master c:
 ddcd856d81861a523d79d077facd875da1f66792 h: refs/heads/master i:   124919:
 85eb6904a2b5d3d7aa0d560c3d91e6bcedc39c12 v: v3

---
 [refs]                               |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_file.c    |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_ioctl.h   | 12 ++++++++++++
 trunk/fs/xfs/linux-2.6/xfs_ioctl32.h |  3 ---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1a8b177ddd43..027aa131c699 100644
--- 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
index 72fc8d8c8bc1..d377db05d806 100644
--- 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
index f67dc69381e8..a3446aad070a 100644
--- 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
index af918749d186..1024c4f8ba0d 100644
--- 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