fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_ioctl32.c

diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
index a7c9ba1..b83cebc 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -15,7 +15,6 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <linux/config.h>
 #include <linux/compat.h>
 #include <linux/init.h>
 #include <linux/ioctl.h>
@@ -72,7 +71,7 @@ xfs_ioctl32_flock(
            copy_in_user(&p->l_pid,     &p32->l_pid,    sizeof(u32)) ||
            copy_in_user(&p->l_pad,     &p32->l_pad,    4*sizeof(u32)))
                return -EFAULT;
-       
+
        return (unsigned long)p;
 }
 
@@ -107,11 +106,15 @@ xfs_ioctl32_bulkstat(
 #endif
 
 STATIC long
-__linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
+xfs_compat_ioctl(
+       int             mode,
+       struct file     *file,
+       unsigned        cmd,
+       unsigned long   arg)
 {
+       struct inode    *inode = file->f_path.dentry->d_inode;
+       bhv_vnode_t     *vp = vn_from_inode(inode);
        int             error;
-       struct          inode *inode = f->f_dentry->d_inode;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
 
        switch (cmd) {
        case XFS_IOC_DIOINFO:
@@ -189,26 +192,26 @@ __linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg)
                return -ENOIOCTLCMD;
        }
 
-       VOP_IOCTL(vp, inode, f, mode, cmd, (void __user *)arg, error);
+       error = bhv_vop_ioctl(vp, inode, file, mode, cmd, (void __user *)arg);
        VMODIFY(vp);
 
        return error;
 }
 
 long
-linvfs_compat_ioctl(
-       struct file             *f,
+xfs_file_compat_ioctl(
+       struct file             *file,
        unsigned                cmd,
        unsigned long           arg)
 {
-       return __linvfs_compat_ioctl(0, f, cmd, arg);
+       return xfs_compat_ioctl(0, file, cmd, arg);
 }
 
 long
-linvfs_compat_invis_ioctl(
-       struct file             *f,
+xfs_file_compat_invis_ioctl(
+       struct file             *file,
        unsigned                cmd,
        unsigned long           arg)
 {
-       return __linvfs_compat_ioctl(IO_INVIS, f, cmd, arg);
+       return xfs_compat_ioctl(IO_INVIS, file, cmd, arg);
 }