Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_file.c
index aaa74d2..c847416 100644 (file)
@@ -1,39 +1,26 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 #include "xfs.h"
-#include "xfs_inum.h"
+#include "xfs_bit.h"
 #include "xfs_log.h"
+#include "xfs_inum.h"
 #include "xfs_sb.h"
+#include "xfs_ag.h"
 #include "xfs_dir.h"
 #include "xfs_dir2.h"
 #include "xfs_trans.h"
 #include "xfs_inode.h"
 #include "xfs_error.h"
 #include "xfs_rw.h"
+#include "xfs_ioctl32.h"
 
 #include <linux/dcache.h>
+#include <linux/smp_lock.h>
 
-static struct vm_operations_struct linvfs_file_vm_ops;
-
+static struct vm_operations_struct xfs_file_vm_ops;
+#ifdef CONFIG_XFS_DMAPI
+static struct vm_operations_struct xfs_dmapi_file_vm_ops;
+#endif
 
 STATIC inline ssize_t
-__linvfs_read(
+__xfs_file_read(
        struct kiocb            *iocb,
-       char __user             *buf,
+       char                    __user *buf,
        int                     ioflags,
        size_t                  count,
        loff_t                  pos)
 {
        struct iovec            iov = {buf, count};
        struct file             *file = iocb->ki_filp;
-       vnode_t                 *vp = LINVFS_GET_VP(file->f_dentry->d_inode);
+       vnode_t                 *vp = vn_from_inode(file->f_dentry->d_inode);
        ssize_t                 rval;
 
        BUG_ON(iocb->ki_pos != pos);
@@ -78,81 +69,70 @@ __linvfs_read(
        return rval;
 }
 
-
 STATIC ssize_t
-linvfs_read(
+xfs_file_aio_read(
        struct kiocb            *iocb,
-       char __user             *buf,
+       char                    __user *buf,
        size_t                  count,
        loff_t                  pos)
 {
-       return __linvfs_read(iocb, buf, 0, count, pos);
+       return __xfs_file_read(iocb, buf, IO_ISAIO, count, pos);
 }
 
 STATIC ssize_t
-linvfs_read_invis(
+xfs_file_aio_read_invis(
        struct kiocb            *iocb,
-       char __user             *buf,
+       char                    __user *buf,
        size_t                  count,
        loff_t                  pos)
 {
-       return __linvfs_read(iocb, buf, IO_INVIS, count, pos);
+       return __xfs_file_read(iocb, buf, IO_ISAIO|IO_INVIS, count, pos);
 }
 
-
 STATIC inline ssize_t
-__linvfs_write(
+__xfs_file_write(
        struct kiocb    *iocb,
-       const char      *buf,
+       const char      __user *buf,
        int             ioflags,
        size_t          count,
        loff_t          pos)
 {
-       struct iovec    iov = {(void *)buf, count};
+       struct iovec    iov = {(void __user *)buf, count};
        struct file     *file = iocb->ki_filp;
        struct inode    *inode = file->f_mapping->host;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
+       vnode_t         *vp = vn_from_inode(inode);
        ssize_t         rval;
 
        BUG_ON(iocb->ki_pos != pos);
-       if (unlikely(file->f_flags & O_DIRECT)) {
+       if (unlikely(file->f_flags & O_DIRECT))
                ioflags |= IO_ISDIRECT;
-               VOP_WRITE(vp, iocb, &iov, 1, &iocb->ki_pos,
-                               ioflags, NULL, rval);
-       } else {
-               down(&inode->i_sem);
-               VOP_WRITE(vp, iocb, &iov, 1, &iocb->ki_pos,
-                               ioflags, NULL, rval);
-               up(&inode->i_sem);
-       }
 
+       VOP_WRITE(vp, iocb, &iov, 1, &iocb->ki_pos, ioflags, NULL, rval);
        return rval;
 }
 
-
 STATIC ssize_t
-linvfs_write(
+xfs_file_aio_write(
        struct kiocb            *iocb,
-       const char __user       *buf,
+       const char              __user *buf,
        size_t                  count,
        loff_t                  pos)
 {
-       return __linvfs_write(iocb, buf, 0, count, pos);
+       return __xfs_file_write(iocb, buf, IO_ISAIO, count, pos);
 }
 
 STATIC ssize_t
-linvfs_write_invis(
+xfs_file_aio_write_invis(
        struct kiocb            *iocb,
-       const char __user       *buf,
+       const char              __user *buf,
        size_t                  count,
        loff_t                  pos)
 {
-       return __linvfs_write(iocb, buf, IO_INVIS, count, pos);
+       return __xfs_file_write(iocb, buf, IO_ISAIO|IO_INVIS, count, pos);
 }
 
-
 STATIC inline ssize_t
-__linvfs_readv(
+__xfs_file_readv(
        struct file             *file,
        const struct iovec      *iov,
        int                     ioflags,
@@ -160,8 +140,8 @@ __linvfs_readv(
        loff_t                  *ppos)
 {
        struct inode    *inode = file->f_mapping->host;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
-       struct          kiocb kiocb;
+       vnode_t         *vp = vn_from_inode(inode);
+       struct kiocb    kiocb;
        ssize_t         rval;
 
        init_sync_kiocb(&kiocb, file);
@@ -170,36 +150,33 @@ __linvfs_readv(
        if (unlikely(file->f_flags & O_DIRECT))
                ioflags |= IO_ISDIRECT;
        VOP_READ(vp, &kiocb, iov, nr_segs, &kiocb.ki_pos, ioflags, NULL, rval);
-       if (rval == -EIOCBQUEUED)
-               rval = wait_on_sync_kiocb(&kiocb);
 
        *ppos = kiocb.ki_pos;
        return rval;
 }
 
 STATIC ssize_t
-linvfs_readv(
+xfs_file_readv(
        struct file             *file,
        const struct iovec      *iov,
        unsigned long           nr_segs,
        loff_t                  *ppos)
 {
-       return __linvfs_readv(file, iov, 0, nr_segs, ppos);
+       return __xfs_file_readv(file, iov, 0, nr_segs, ppos);
 }
 
 STATIC ssize_t
-linvfs_readv_invis(
+xfs_file_readv_invis(
        struct file             *file,
        const struct iovec      *iov,
        unsigned long           nr_segs,
        loff_t                  *ppos)
 {
-       return __linvfs_readv(file, iov, IO_INVIS, nr_segs, ppos);
+       return __xfs_file_readv(file, iov, IO_INVIS, nr_segs, ppos);
 }
 
-
 STATIC inline ssize_t
-__linvfs_writev(
+__xfs_file_writev(
        struct file             *file,
        const struct iovec      *iov,
        int                     ioflags,
@@ -207,90 +184,151 @@ __linvfs_writev(
        loff_t                  *ppos)
 {
        struct inode    *inode = file->f_mapping->host;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
-       struct          kiocb kiocb;
+       vnode_t         *vp = vn_from_inode(inode);
+       struct kiocb    kiocb;
        ssize_t         rval;
 
        init_sync_kiocb(&kiocb, file);
        kiocb.ki_pos = *ppos;
-       if (unlikely(file->f_flags & O_DIRECT)) {
+       if (unlikely(file->f_flags & O_DIRECT))
                ioflags |= IO_ISDIRECT;
-               VOP_WRITE(vp, &kiocb, iov, nr_segs, &kiocb.ki_pos,
-                               ioflags, NULL, rval);
-       } else {
-               down(&inode->i_sem);
-               VOP_WRITE(vp, &kiocb, iov, nr_segs, &kiocb.ki_pos,
-                               ioflags, NULL, rval);
-               up(&inode->i_sem);
-       }
 
-       if (rval == -EIOCBQUEUED)
-               rval = wait_on_sync_kiocb(&kiocb);
+       VOP_WRITE(vp, &kiocb, iov, nr_segs, &kiocb.ki_pos, ioflags, NULL, rval);
 
        *ppos = kiocb.ki_pos;
        return rval;
 }
 
-
 STATIC ssize_t
-linvfs_writev(
+xfs_file_writev(
        struct file             *file,
        const struct iovec      *iov,
        unsigned long           nr_segs,
        loff_t                  *ppos)
 {
-       return __linvfs_writev(file, iov, 0, nr_segs, ppos);
+       return __xfs_file_writev(file, iov, 0, nr_segs, ppos);
 }
 
 STATIC ssize_t
-linvfs_writev_invis(
+xfs_file_writev_invis(
        struct file             *file,
        const struct iovec      *iov,
        unsigned long           nr_segs,
        loff_t                  *ppos)
 {
-       return __linvfs_writev(file, iov, IO_INVIS, nr_segs, ppos);
+       return __xfs_file_writev(file, iov, IO_INVIS, nr_segs, ppos);
 }
 
 STATIC ssize_t
-linvfs_sendfile(
+xfs_file_sendfile(
        struct file             *filp,
-       loff_t                  *ppos,
+       loff_t                  *pos,
        size_t                  count,
        read_actor_t            actor,
        void                    *target)
 {
-       vnode_t                 *vp = LINVFS_GET_VP(filp->f_dentry->d_inode);
+       vnode_t                 *vp = vn_from_inode(filp->f_dentry->d_inode);
        ssize_t                 rval;
 
-       VOP_SENDFILE(vp, filp, ppos, 0, count, actor, target, NULL, rval);
+       VOP_SENDFILE(vp, filp, pos, 0, count, actor, target, NULL, rval);
        return rval;
 }
 
+STATIC ssize_t
+xfs_file_sendfile_invis(
+       struct file             *filp,
+       loff_t                  *pos,
+       size_t                  count,
+       read_actor_t            actor,
+       void                    *target)
+{
+       vnode_t                 *vp = vn_from_inode(filp->f_dentry->d_inode);
+       ssize_t                 rval;
+
+       VOP_SENDFILE(vp, filp, pos, IO_INVIS, count, actor, target, NULL, rval);
+       return rval;
+}
+
+STATIC ssize_t
+xfs_file_splice_read(
+       struct file             *infilp,
+       loff_t                  *ppos,
+       struct pipe_inode_info  *pipe,
+       size_t                  len,
+       unsigned int            flags)
+{
+       vnode_t                 *vp = vn_from_inode(infilp->f_dentry->d_inode);
+       ssize_t                 rval;
+
+       VOP_SPLICE_READ(vp, infilp, ppos, pipe, len, flags, 0, NULL, rval);
+       return rval;
+}
+
+STATIC ssize_t
+xfs_file_splice_read_invis(
+       struct file             *infilp,
+       loff_t                  *ppos,
+       struct pipe_inode_info  *pipe,
+       size_t                  len,
+       unsigned int            flags)
+{
+       vnode_t                 *vp = vn_from_inode(infilp->f_dentry->d_inode);
+       ssize_t                 rval;
+
+       VOP_SPLICE_READ(vp, infilp, ppos, pipe, len, flags, IO_INVIS, NULL, rval);
+       return rval;
+}
+
+STATIC ssize_t
+xfs_file_splice_write(
+       struct pipe_inode_info  *pipe,
+       struct file             *outfilp,
+       loff_t                  *ppos,
+       size_t                  len,
+       unsigned int            flags)
+{
+       vnode_t                 *vp = vn_from_inode(outfilp->f_dentry->d_inode);
+       ssize_t                 rval;
+
+       VOP_SPLICE_WRITE(vp, pipe, outfilp, ppos, len, flags, 0, NULL, rval);
+       return rval;
+}
+
+STATIC ssize_t
+xfs_file_splice_write_invis(
+       struct pipe_inode_info  *pipe,
+       struct file             *outfilp,
+       loff_t                  *ppos,
+       size_t                  len,
+       unsigned int            flags)
+{
+       vnode_t                 *vp = vn_from_inode(outfilp->f_dentry->d_inode);
+       ssize_t                 rval;
+
+       VOP_SPLICE_WRITE(vp, pipe, outfilp, ppos, len, flags, IO_INVIS, NULL, rval);
+       return rval;
+}
 
 STATIC int
-linvfs_open(
+xfs_file_open(
        struct inode    *inode,
        struct file     *filp)
 {
-       vnode_t         *vp = LINVFS_GET_VP(inode);
+       vnode_t         *vp = vn_from_inode(inode);
        int             error;
 
        if (!(filp->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)
                return -EFBIG;
-
-       ASSERT(vp);
        VOP_OPEN(vp, NULL, error);
        return -error;
 }
 
-
 STATIC int
-linvfs_release(
+xfs_file_release(
        struct inode    *inode,
        struct file     *filp)
 {
-       vnode_t         *vp = LINVFS_GET_VP(inode);
+       vnode_t         *vp = vn_from_inode(inode);
        int             error = 0;
 
        if (vp)
@@ -298,41 +336,53 @@ linvfs_release(
        return -error;
 }
 
-
 STATIC int
-linvfs_fsync(
+xfs_file_fsync(
        struct file     *filp,
        struct dentry   *dentry,
        int             datasync)
 {
        struct inode    *inode = dentry->d_inode;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
+       vnode_t         *vp = vn_from_inode(inode);
        int             error;
        int             flags = FSYNC_WAIT;
 
        if (datasync)
                flags |= FSYNC_DATA;
-
-       ASSERT(vp);
        VOP_FSYNC(vp, flags, NULL, (xfs_off_t)0, (xfs_off_t)-1, error);
        return -error;
 }
 
-/*
- * linvfs_readdir maps to VOP_READDIR().
- * We need to build a uio, cred, ...
- */
+#ifdef CONFIG_XFS_DMAPI
+STATIC struct page *
+xfs_vm_nopage(
+       struct vm_area_struct   *area,
+       unsigned long           address,
+       int                     *type)
+{
+       struct inode    *inode = area->vm_file->f_dentry->d_inode;
+       vnode_t         *vp = vn_from_inode(inode);
+       xfs_mount_t     *mp = XFS_VFSTOM(vp->v_vfsp);
+       int             error;
+
+       ASSERT_ALWAYS(vp->v_vfsp->vfs_flag & VFS_DMI);
+
+       error = XFS_SEND_MMAP(mp, area, 0);
+       if (error)
+               return NULL;
 
-#define nextdp(dp)      ((struct xfs_dirent *)((char *)(dp) + (dp)->d_reclen))
+       return filemap_nopage(area, address, type);
+}
+#endif /* CONFIG_XFS_DMAPI */
 
 STATIC int
-linvfs_readdir(
+xfs_file_readdir(
        struct file     *filp,
        void            *dirent,
        filldir_t       filldir)
 {
        int             error = 0;
-       vnode_t         *vp;
+       vnode_t         *vp = vn_from_inode(filp->f_dentry->d_inode);
        uio_t           uio;
        iovec_t         iov;
        int             eof = 0;
@@ -342,9 +392,6 @@ linvfs_readdir(
        xfs_off_t       start_offset, curr_offset;
        xfs_dirent_t    *dbp = NULL;
 
-       vp = LINVFS_GET_VP(filp->f_dentry->d_inode);
-       ASSERT(vp);
-
        /* Try fairly hard to get memory */
        do {
                if ((read_buf = (caddr_t)kmalloc(rlen, GFP_KERNEL)))
@@ -389,7 +436,7 @@ linvfs_readdir(
                        }
                        size -= dbp->d_reclen;
                        curr_offset = (loff_t)dbp->d_off /* & 0x7fffffff */;
-                       dbp = nextdp(dbp);
+                       dbp = (xfs_dirent_t *)((char *)dbp + dbp->d_reclen);
                }
        }
 done:
@@ -404,44 +451,43 @@ done:
        return -error;
 }
 
-
 STATIC int
-linvfs_file_mmap(
+xfs_file_mmap(
        struct file     *filp,
        struct vm_area_struct *vma)
 {
        struct inode    *ip = filp->f_dentry->d_inode;
-       vnode_t         *vp = LINVFS_GET_VP(ip);
-       vattr_t         va = { .va_mask = XFS_AT_UPDATIME };
+       vnode_t         *vp = vn_from_inode(ip);
+       vattr_t         vattr;
        int             error;
 
-       if ((vp->v_type == VREG) && (vp->v_vfsp->vfs_flag & VFS_DMI)) {
-               xfs_mount_t     *mp = XFS_VFSTOM(vp->v_vfsp);
+       vma->vm_ops = &xfs_file_vm_ops;
 
-               error = -XFS_SEND_MMAP(mp, vma, 0);
-               if (error)
-                       return error;
+#ifdef CONFIG_XFS_DMAPI
+       if (vp->v_vfsp->vfs_flag & VFS_DMI) {
+               vma->vm_ops = &xfs_dmapi_file_vm_ops;
        }
+#endif /* CONFIG_XFS_DMAPI */
 
-       vma->vm_ops = &linvfs_file_vm_ops;
-
-       VOP_SETATTR(vp, &va, XFS_AT_UPDATIME, NULL, error);
+       vattr.va_mask = XFS_AT_UPDATIME;
+       VOP_SETATTR(vp, &vattr, XFS_AT_UPDATIME, NULL, error);
+       if (likely(!error))
+               __vn_revalidate(vp, &vattr);    /* update flags */
        return 0;
 }
 
 
-STATIC int
-linvfs_ioctl(
-       struct inode    *inode,
+STATIC long
+xfs_file_ioctl(
        struct file     *filp,
        unsigned int    cmd,
        unsigned long   arg)
 {
        int             error;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
+       struct inode    *inode = filp->f_dentry->d_inode;
+       vnode_t         *vp = vn_from_inode(inode);
 
-       ASSERT(vp);
-       VOP_IOCTL(vp, inode, filp, 0, cmd, arg, error);
+       VOP_IOCTL(vp, inode, filp, 0, cmd, (void __user *)arg, error);
        VMODIFY(vp);
 
        /* NOTE:  some of the ioctl's return positive #'s as a
@@ -453,18 +499,17 @@ linvfs_ioctl(
        return error;
 }
 
-STATIC int
-linvfs_ioctl_invis(
-       struct inode    *inode,
+STATIC long
+xfs_file_ioctl_invis(
        struct file     *filp,
        unsigned int    cmd,
        unsigned long   arg)
 {
+       struct inode    *inode = filp->f_dentry->d_inode;
+       vnode_t         *vp = vn_from_inode(inode);
        int             error;
-       vnode_t         *vp = LINVFS_GET_VP(inode);
 
-       ASSERT(vp);
-       VOP_IOCTL(vp, inode, filp, IO_INVIS, cmd, arg, error);
+       VOP_IOCTL(vp, inode, filp, IO_INVIS, cmd, (void __user *)arg, error);
        VMODIFY(vp);
 
        /* NOTE:  some of the ioctl's return positive #'s as a
@@ -476,16 +521,17 @@ linvfs_ioctl_invis(
        return error;
 }
 
+#ifdef CONFIG_XFS_DMAPI
 #ifdef HAVE_VMOP_MPROTECT
 STATIC int
-linvfs_mprotect(
+xfs_vm_mprotect(
        struct vm_area_struct *vma,
        unsigned int    newflags)
 {
-       vnode_t         *vp = LINVFS_GET_VP(vma->vm_file->f_dentry->d_inode);
+       vnode_t         *vp = vn_from_inode(vma->vm_file->f_dentry->d_inode);
        int             error = 0;
 
-       if ((vp->v_type == VREG) && (vp->v_vfsp->vfs_flag & VFS_DMI)) {
+       if (vp->v_vfsp->vfs_flag & VFS_DMI) {
                if ((vma->vm_flags & VM_MAYSHARE) &&
                    (newflags & VM_WRITE) && !(vma->vm_flags & VM_WRITE)) {
                        xfs_mount_t     *mp = XFS_VFSTOM(vp->v_vfsp);
@@ -496,51 +542,106 @@ linvfs_mprotect(
        return error;
 }
 #endif /* HAVE_VMOP_MPROTECT */
+#endif /* CONFIG_XFS_DMAPI */
+
+#ifdef HAVE_FOP_OPEN_EXEC
+/* If the user is attempting to execute a file that is offline then
+ * we have to trigger a DMAPI READ event before the file is marked as busy
+ * otherwise the invisible I/O will not be able to write to the file to bring
+ * it back online.
+ */
+STATIC int
+xfs_file_open_exec(
+       struct inode    *inode)
+{
+       vnode_t         *vp = vn_from_inode(inode);
+       xfs_mount_t     *mp = XFS_VFSTOM(vp->v_vfsp);
+       int             error = 0;
+       xfs_inode_t     *ip;
 
+       if (vp->v_vfsp->vfs_flag & VFS_DMI) {
+               ip = xfs_vtoi(vp);
+               if (!ip) {
+                       error = -EINVAL;
+                       goto open_exec_out;
+               }
+               if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ)) {
+                       error = -XFS_SEND_DATA(mp, DM_EVENT_READ, vp,
+                                              0, 0, 0, NULL);
+               }
+       }
+open_exec_out:
+       return error;
+}
+#endif /* HAVE_FOP_OPEN_EXEC */
 
-struct file_operations linvfs_file_operations = {
+const struct file_operations xfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read           = do_sync_read,
        .write          = do_sync_write,
-       .readv          = linvfs_readv,
-       .writev         = linvfs_writev,
-       .aio_read       = linvfs_read,
-       .aio_write      = linvfs_write,
-       .sendfile       = linvfs_sendfile,
-       .ioctl          = linvfs_ioctl,
-       .mmap           = linvfs_file_mmap,
-       .open           = linvfs_open,
-       .release        = linvfs_release,
-       .fsync          = linvfs_fsync,
+       .readv          = xfs_file_readv,
+       .writev         = xfs_file_writev,
+       .aio_read       = xfs_file_aio_read,
+       .aio_write      = xfs_file_aio_write,
+       .sendfile       = xfs_file_sendfile,
+       .splice_read    = xfs_file_splice_read,
+       .splice_write   = xfs_file_splice_write,
+       .unlocked_ioctl = xfs_file_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = xfs_file_compat_ioctl,
+#endif
+       .mmap           = xfs_file_mmap,
+       .open           = xfs_file_open,
+       .release        = xfs_file_release,
+       .fsync          = xfs_file_fsync,
+#ifdef HAVE_FOP_OPEN_EXEC
+       .open_exec      = xfs_file_open_exec,
+#endif
 };
 
-struct file_operations linvfs_invis_file_operations = {
+const struct file_operations xfs_invis_file_operations = {
        .llseek         = generic_file_llseek,
        .read           = do_sync_read,
        .write          = do_sync_write,
-       .readv          = linvfs_readv_invis,
-       .writev         = linvfs_writev_invis,
-       .aio_read       = linvfs_read_invis,
-       .aio_write      = linvfs_write_invis,
-       .sendfile       = linvfs_sendfile,
-       .ioctl          = linvfs_ioctl_invis,
-       .mmap           = linvfs_file_mmap,
-       .open           = linvfs_open,
-       .release        = linvfs_release,
-       .fsync          = linvfs_fsync,
+       .readv          = xfs_file_readv_invis,
+       .writev         = xfs_file_writev_invis,
+       .aio_read       = xfs_file_aio_read_invis,
+       .aio_write      = xfs_file_aio_write_invis,
+       .sendfile       = xfs_file_sendfile_invis,
+       .splice_read    = xfs_file_splice_read_invis,
+       .splice_write   = xfs_file_splice_write_invis,
+       .unlocked_ioctl = xfs_file_ioctl_invis,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = xfs_file_compat_invis_ioctl,
+#endif
+       .mmap           = xfs_file_mmap,
+       .open           = xfs_file_open,
+       .release        = xfs_file_release,
+       .fsync          = xfs_file_fsync,
 };
 
 
-struct file_operations linvfs_dir_operations = {
+const struct file_operations xfs_dir_file_operations = {
        .read           = generic_read_dir,
-       .readdir        = linvfs_readdir,
-       .ioctl          = linvfs_ioctl,
-       .fsync          = linvfs_fsync,
+       .readdir        = xfs_file_readdir,
+       .unlocked_ioctl = xfs_file_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = xfs_file_compat_ioctl,
+#endif
+       .fsync          = xfs_file_fsync,
 };
 
-static struct vm_operations_struct linvfs_file_vm_ops = {
+static struct vm_operations_struct xfs_file_vm_ops = {
        .nopage         = filemap_nopage,
+       .populate       = filemap_populate,
+};
+
+#ifdef CONFIG_XFS_DMAPI
+static struct vm_operations_struct xfs_dmapi_file_vm_ops = {
+       .nopage         = xfs_vm_nopage,
+       .populate       = filemap_populate,
 #ifdef HAVE_VMOP_MPROTECT
-       .mprotect       = linvfs_mprotect,
+       .mprotect       = xfs_vm_mprotect,
 #endif
 };
+#endif /* CONFIG_XFS_DMAPI */