[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>

5 files changed, 12 insertions, 22 deletions

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 4ed28a6767bb..726449d4fd22 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -102,9 +102,7 @@ xfs_fs_encode_fh(
         int                     len;
         int                     is64 = 0;
 #if XFS_BIG_INUMS
-        bhv_vfs_t               *vfs = vfs_from_sb(inode->i_sb);
-
-        if (!(vfs->vfs_flag & VFS_32BITINODES)) {
+        if (!(XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_SMALL_INUMS)) {
                 /* filesystem may contain 64bit inode numbers */
                 is64 = XFS_FILEID_TYPE_64FLAG;
         }
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);
                 }
         }
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 24bc0afb003c..e275b7a82bc1 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -534,7 +534,7 @@ vfs_sync_worker(
 {
         int             error;
 
-        if (!(vfsp->vfs_flag & VFS_RDONLY))
+        if (!(XFS_VFSTOM(vfsp)->m_flags & XFS_MOUNT_RDONLY))
                 error = xfs_sync(XFS_VFSTOM(vfsp), SYNC_FSDATA | SYNC_BDFLUSH | \
                                         SYNC_ATTR | SYNC_REFCACHE | SYNC_SUPER);
         vfsp->vfs_sync_seq++;
@@ -793,6 +793,9 @@ xfs_fs_fill_super(
         mp->m_vfsp = vfsp;
         vfsp->vfs_mount = mp;
 
+        if (sb->s_flags & MS_RDONLY)
+                mp->m_flags |= XFS_MOUNT_RDONLY;
+
         error = xfs_parseargs(mp, (char *)data, args, 0);
         if (error)
                 goto fail_vfsop;
diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c
index 573e52a24072..b098e0903353 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.c
+++ b/fs/xfs/linux-2.6/xfs_vfs.c
@@ -211,9 +211,6 @@ vfs_allocate(
         vfsp->vfs_super = sb;
         sb->s_fs_info = vfsp;
 
-        if (sb->s_flags & MS_RDONLY)
-                vfsp->vfs_flag |= VFS_RDONLY;
-
         return vfsp;
 }
 
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h
index 943f581bdb47..5c4996356226 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.h
+++ b/fs/xfs/linux-2.6/xfs_vfs.h
@@ -43,7 +43,6 @@ typedef struct bhv_vfs_sync_work {
 
 typedef struct bhv_vfs {
         struct xfs_mount        *vfs_mount;
-        u_int                   vfs_flag;       /* flags */
         struct super_block      *vfs_super;     /* generic superblock pointer */
         struct task_struct      *vfs_sync_task; /* generalised sync thread */
         bhv_vfs_sync_work_t     vfs_sync_work;  /* work item for VFS_SYNC */
@@ -53,13 +52,6 @@ typedef struct bhv_vfs {
         wait_queue_head_t       vfs_wait_single_sync_task;
 } bhv_vfs_t;
 
-#define VFS_RDONLY              0x0001  /* read-only vfs */
-#define VFS_GRPID               0x0002  /* group-ID assigned from directory */
-#define VFS_DMI                 0x0004  /* filesystem has the DMI enabled */
-/* ---- VFS_UMOUNT ----         0x0008  -- unneeded, fixed via kthread APIs */
-#define VFS_32BITINODES         0x0010  /* do not use inums above 32 bits */
-#define VFS_END                 0x0010  /* max flag */
-
 #define SYNC_ATTR               0x0001  /* sync attributes */
 #define SYNC_CLOSE              0x0002  /* close file system down */
 #define SYNC_DELWRI             0x0004  /* look at delayed writes */