[XFS] kill the vfs_flags member in struct bhv_vfs

All flags are added to xfs_mount's m_flag instead. Note that the 32bit
inode flag was duplicated in both of them, but only cleared in the mount
when it was not nessecary due to the filesystem beeing small enough. Two
flags are still required here - one to indicate the mount option setting,
and one to indicate if it applies or not.

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

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, 7 insertions, 7 deletions

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 123659e74b53..fb8dd34041eb 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -259,7 +259,7 @@ xfs_file_mmap(
         vma->vm_flags |= VM_CAN_NONLINEAR;
 
 #ifdef CONFIG_XFS_DMAPI
-        if (vfs_from_sb(filp->f_path.dentry->d_inode->i_sb)->vfs_flag & VFS_DMI)
+        if (XFS_M(filp->f_path.dentry->d_inode->i_sb)->m_flags & XFS_MOUNT_DMAPI)
                 vma->vm_ops = &xfs_dmapi_file_vm_ops;
 #endif /* CONFIG_XFS_DMAPI */
 
@@ -317,13 +317,13 @@ xfs_vm_mprotect(
         unsigned int    newflags)
 {
         struct inode    *inode = vma->vm_file->f_path.dentry->d_inode;
-        bhv_vfs_t       *vfsp = vfs_from_sb(inode->i_sb);
+        struct xfs_mount *mp = XFS_M(inode->i_sb);
         int             error = 0;
 
-        if (vfsp->vfs_flag & VFS_DMI) {
+        if (mp->m_flags & XFS_MOUNT_DMAPI) {
                 if ((vma->vm_flags & VM_MAYSHARE) &&
                     (newflags & VM_WRITE) && !(vma->vm_flags & VM_WRITE))
-                        error = XFS_SEND_MMAP(XFS_VFSTOM(vfsp), vma, VM_WRITE);
+                        error = XFS_SEND_MMAP(mp, vma, VM_WRITE);
         }
         return error;
 }
@@ -340,13 +340,13 @@ STATIC int
 xfs_file_open_exec(
         struct inode    *inode)
 {
-        bhv_vfs_t       *vfsp = vfs_from_sb(inode->i_sb);
+        struct xfs_mount *mp = XFS_M(inode->i_sb);
 
-        if (unlikely(vfsp->vfs_flag & VFS_DMI)) {
+        if (unlikely(mp->m_flags & XFS_MOUNT_DMAPI)) {
                 if (DM_EVENT_ENABLED(XFS_I(inode), DM_EVENT_READ)) {
                         bhv_vnode_t *vp = vn_from_inode(inode);
 
-                        return -XFS_SEND_DATA(XFS_VFSTOM(vfsp), DM_EVENT_READ,
+                        return -XFS_SEND_DATA(mp, DM_EVENT_READ,
                                                 vp, 0, 0, 0, NULL);
                 }
         }