1 files changed, 8 insertions, 13 deletions

diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index 2df67fd913e5..ad5579d4eac4 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
@@ -81,18 +81,13 @@ STATIC void	xfs_qm_export_dquot(xfs_mount_t *, xfs_disk_dquot_t *,
  */
 int
 xfs_qm_quotactl(
-        struct bhv_desc *bdp,
+        xfs_mount_t     *mp,
         int             cmd,
         int             id,
         xfs_caddr_t     addr)
 {
-        xfs_mount_t     *mp;
-        bhv_vfs_t       *vfsp;
         int             error;
 
-        vfsp = bhvtovfs(bdp);
-        mp = XFS_VFSTOM(vfsp);
-
         ASSERT(addr != NULL || cmd == Q_XQUOTASYNC);
 
         /*
@@ -105,7 +100,7 @@ xfs_qm_quotactl(
                  */
                 if (XFS_IS_QUOTA_ON(mp))
                         return XFS_ERROR(EINVAL);
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 return (xfs_qm_scall_trunc_qfiles(mp,
                                xfs_qm_import_qtype_flags(*(uint *)addr)));
@@ -121,13 +116,13 @@ xfs_qm_quotactl(
                  * QUOTAON - enabling quota enforcement.
                  * Quota accounting must be turned on at mount time.
                  */
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 return (xfs_qm_scall_quotaon(mp,
                                           xfs_qm_import_flags(*(uint *)addr)));
 
         case Q_XQUOTAOFF:
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 break;
 
@@ -143,7 +138,7 @@ xfs_qm_quotactl(
 
         switch (cmd) {
         case Q_XQUOTAOFF:
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 error = xfs_qm_scall_quotaoff(mp,
                                             xfs_qm_import_flags(*(uint *)addr),
@@ -164,19 +159,19 @@ xfs_qm_quotactl(
                 break;
 
         case Q_XSETQLIM:
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 error = xfs_qm_scall_setqlim(mp, (xfs_dqid_t)id, XFS_DQ_USER,
                                              (fs_disk_quota_t *)addr);
                 break;
         case Q_XSETGQLIM:
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 error = xfs_qm_scall_setqlim(mp, (xfs_dqid_t)id, XFS_DQ_GROUP,
                                              (fs_disk_quota_t *)addr);
                 break;
         case Q_XSETPQLIM:
-                if (vfsp->vfs_flag & VFS_RDONLY)
+                if (mp->m_flags & XFS_MOUNT_RDONLY)
                         return XFS_ERROR(EROFS);
                 error = xfs_qm_scall_setqlim(mp, (xfs_dqid_t)id, XFS_DQ_PROJ,
                                              (fs_disk_quota_t *)addr);