1 files changed, 16 insertions, 15 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 1d68ffcdeaa7..979a77d4b87d 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -17,12 +17,12 @@
  */
 
 #include "xfs.h"
+#include "xfs_format.h"
 #include "xfs_log.h"
 #include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
-#include "xfs_dir2.h"
 #include "xfs_alloc.h"
 #include "xfs_quota.h"
 #include "xfs_mount.h"
@@ -40,12 +40,12 @@
 #include "xfs_fsops.h"
 #include "xfs_attr.h"
 #include "xfs_buf_item.h"
-#include "xfs_utils.h"
-#include "xfs_vnodeops.h"
 #include "xfs_log_priv.h"
 #include "xfs_trans_priv.h"
 #include "xfs_filestream.h"
 #include "xfs_da_btree.h"
+#include "xfs_dir2_format.h"
+#include "xfs_dir2.h"
 #include "xfs_extfree_item.h"
 #include "xfs_mru_cache.h"
 #include "xfs_inode_item.h"
@@ -421,12 +421,6 @@ xfs_parseargs(
         }
 #endif
 
-        if ((mp->m_qflags & (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE)) &&
-            (mp->m_qflags & (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE))) {
-                xfs_warn(mp, "cannot mount with both project and group quota");
-                return EINVAL;
-        }
-
         if ((dsunit && !dswidth) || (!dsunit && dswidth)) {
                 xfs_warn(mp, "sunit and swidth must be specified together");
                 return EINVAL;
@@ -556,14 +550,13 @@ xfs_showargs(
         else if (mp->m_qflags & XFS_UQUOTA_ACCT)
                 seq_puts(m, "," MNTOPT_UQUOTANOENF);
 
-        /* Either project or group quotas can be active, not both */
-
         if (mp->m_qflags & XFS_PQUOTA_ACCT) {
                 if (mp->m_qflags & XFS_PQUOTA_ENFD)
                         seq_puts(m, "," MNTOPT_PRJQUOTA);
                 else
                         seq_puts(m, "," MNTOPT_PQUOTANOENF);
-        } else if (mp->m_qflags & XFS_GQUOTA_ACCT) {
+        }
+        if (mp->m_qflags & XFS_GQUOTA_ACCT) {
                 if (mp->m_qflags & XFS_GQUOTA_ENFD)
                         seq_puts(m, "," MNTOPT_GRPQUOTA);
                 else
@@ -870,17 +863,17 @@ xfs_init_mount_workqueues(
                 goto out_destroy_unwritten;
 
         mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",
-                        WQ_NON_REENTRANT, 0, mp->m_fsname);
+                        0, 0, mp->m_fsname);
         if (!mp->m_reclaim_workqueue)
                 goto out_destroy_cil;
 
         mp->m_log_workqueue = alloc_workqueue("xfs-log/%s",
-                        WQ_NON_REENTRANT, 0, mp->m_fsname);
+                        0, 0, mp->m_fsname);
         if (!mp->m_log_workqueue)
                 goto out_destroy_reclaim;
 
         mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s",
-                        WQ_NON_REENTRANT, 0, mp->m_fsname);
+                        0, 0, mp->m_fsname);
         if (!mp->m_eofblocks_workqueue)
                 goto out_destroy_log;
 
@@ -1396,6 +1389,14 @@ xfs_finish_flags(
                 return XFS_ERROR(EROFS);
         }
 
+        if ((mp->m_qflags & (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE)) &&
+            (mp->m_qflags & (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE)) &&
+            !xfs_sb_version_has_pquotino(&mp->m_sb)) {
+                xfs_warn(mp,
+                  "Super block does not support project and group quota together");
+                return XFS_ERROR(EINVAL);
+        }
+
         return 0;
 }