mkfs: PQUOTA shouldn't conflict with GQNOENFORCE

Codex points out that project quota isn't incompatible with
non-enforcing group quota in the kernel, so those shouldn't be
incompatible in mkfs either.

Furthermore, project and group quotas are never incompatible on QUOTABIT
and V5 filesystems, so this is clearly a fat-finger error.

Cc: <linux-xfs@vger.kernel.org> # v6.13.0
Fixes: 525f826429a868 ("mkfs: add quota flags when setting up filesystem")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 3da11c664255b120fccb4d8057d7b3df417df7d5..a4864c37a8821b5c9274f7a1e70d77964f01662c 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -976,7 +976,7 @@ static struct opt_params mopts = {
                  .defaultval = 1,
                },
                { .index = M_PQUOTA,
-                 .conflicts = { { &mopts, M_GQNOENFORCE },
+                 .conflicts = { { &mopts, M_PQNOENFORCE },
                                 { NULL, LAST_CONFLICT } },
                  .minval = 0,
                  .maxval = 1,