1 files changed, 6 insertions, 3 deletions

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index cf09aa845d8c..7a3e007b49f4 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -299,8 +299,10 @@ xfs_qm_mount_quotas(
          */
         if (!XFS_IS_UQUOTA_ON(mp))
                 mp->m_qflags &= ~XFS_UQUOTA_CHKD;
-        if (!(XFS_IS_GQUOTA_ON(mp) || XFS_IS_PQUOTA_ON(mp)))
-                mp->m_qflags &= ~XFS_OQUOTA_CHKD;
+        if (!XFS_IS_GQUOTA_ON(mp))
+                mp->m_qflags &= ~XFS_GQUOTA_CHKD;
+        if (!XFS_IS_PQUOTA_ON(mp))
+                mp->m_qflags &= ~XFS_PQUOTA_CHKD;
 
  write_changes:
         /*
@@ -1297,7 +1299,8 @@ xfs_qm_quotacheck(
                                          &buffer_list);
                 if (error)
                         goto error_return;
-                flags |= XFS_OQUOTA_CHKD;
+                flags |= XFS_IS_GQUOTA_ON(mp) ?
+                                        XFS_GQUOTA_CHKD : XFS_PQUOTA_CHKD;
         }
 
         do {