[XFS] kill v_vfsp member from struct bhv_vnode

We can easily get at the vfsp through the super_block but it will soon be
gone anyway.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29494a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 14 insertions, 17 deletions

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 83707708ebb1..1d72dbb1a73d 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -261,7 +261,7 @@ xfs_file_mmap(
         vma->vm_flags |= VM_CAN_NONLINEAR;
 
 #ifdef CONFIG_XFS_DMAPI
-        if (vn_from_inode(filp->f_path.dentry->d_inode)->v_vfsp->vfs_flag & VFS_DMI)
+        if (vfs_from_sb(filp->f_path.dentry->d_inode->i_sb)->vfs_flag & VFS_DMI)
                 vma->vm_ops = &xfs_dmapi_file_vm_ops;
 #endif /* CONFIG_XFS_DMAPI */
 
@@ -320,16 +320,14 @@ xfs_vm_mprotect(
         struct vm_area_struct *vma,
         unsigned int    newflags)
 {
-        bhv_vnode_t     *vp = vn_from_inode(vma->vm_file->f_path.dentry->d_inode);
+        struct inode    *inode = vma->vm_file->f_path.dentry->d_inode;
+        bhv_vfs_t       *vfsp = vfs_from_sb(inode->i_sb);
         int             error = 0;
 
-        if (vp->v_vfsp->vfs_flag & VFS_DMI) {
+        if (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);
-
-                        error = XFS_SEND_MMAP(mp, vma, VM_WRITE);
-                    }
+                    (newflags & VM_WRITE) && !(vma->vm_flags & VM_WRITE))
+                        error = XFS_SEND_MMAP(XFS_VFSTOM(vfsp), vma, VM_WRITE);
         }
         return error;
 }
@@ -346,18 +344,17 @@ STATIC int
 xfs_file_open_exec(
         struct inode    *inode)
 {
-        bhv_vnode_t     *vp = vn_from_inode(inode);
+        bhv_vfs_t       *vfsp = vfs_from_sb(inode->i_sb);
 
-        if (unlikely(vp->v_vfsp->vfs_flag & VFS_DMI)) {
-                xfs_mount_t     *mp = XFS_VFSTOM(vp->v_vfsp);
-                xfs_inode_t     *ip = xfs_vtoi(vp);
+        if (unlikely(vfsp->vfs_flag & VFS_DMI)) {
+                if (DM_EVENT_ENABLED(XFS_I(inode), DM_EVENT_READ)) {
+                        bhv_vnode_t *vp = vn_from_inode(inode);
 
-                if (!ip)
-                        return -EINVAL;
-                if (DM_EVENT_ENABLED(ip, DM_EVENT_READ))
-                        return -XFS_SEND_DATA(mp, DM_EVENT_READ, vp,
-                                               0, 0, 0, NULL);
+                        return -XFS_SEND_DATA(XFS_VFSTOM(vfsp), DM_EVENT_READ,
+                                                vp, 0, 0, 0, NULL);
+                }
         }
+
         return 0;
 }
 #endif /* HAVE_FOP_OPEN_EXEC */