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

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 87bc9280b786..6b1aa7d6f434 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -359,7 +359,7 @@ xfs_initialize_perag(
         /* Clear the mount flag if no inode can overflow 32 bits
          * on this filesystem, or if specifically requested..
          */
-        if ((vfs->vfs_flag & VFS_32BITINODES) && ino > max_inum) {
+        if ((mp->m_flags & XFS_MOUNT_SMALL_INUMS) && ino > max_inum) {
                 mp->m_flags |= XFS_MOUNT_32BITINODES;
         } else {
                 mp->m_flags &= ~XFS_MOUNT_32BITINODES;
@@ -1116,7 +1116,7 @@ xfs_mountfs(
          * If fs is not mounted readonly, then update the superblock
          * unit and width changes.
          */
-        if (update_flags && !(vfsp->vfs_flag & VFS_RDONLY))
+        if (update_flags && !(mp->m_flags & XFS_MOUNT_RDONLY))
                 xfs_mount_log_sbunit(mp, update_flags);
 
         /*
@@ -1289,7 +1289,7 @@ xfs_fs_writable(xfs_mount_t *mp)
         bhv_vfs_t       *vfsp = XFS_MTOVFS(mp);
 
         return !(vfs_test_for_freeze(vfsp) || XFS_FORCED_SHUTDOWN(mp) ||
-                (vfsp->vfs_flag & VFS_RDONLY));
+                (mp->m_flags & XFS_MOUNT_RDONLY));
 }
 
 /*
@@ -1367,7 +1367,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)
          * skip superblock write if fs is read-only, or
          * if we are doing a forced umount.
          */
-        if (!(XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY ||
+        if (!((mp->m_flags & XFS_MOUNT_RDONLY) ||
                 XFS_FORCED_SHUTDOWN(mp))) {
 
                 sbp = xfs_getsb(mp, 0);