Commit 4f3252e7 authored Apr 12, 2023 by Kaixu Xia Committed by Greg Kroah-Hartman Apr 20, 2023

xfs: show the proper user quota options



commit 237d7887ae723af7d978e8b9a385fdff416f357b upstream.

The quota option 'usrquota' should be shown if both the XFS_UQUOTA_ACCT
and XFS_UQUOTA_ENFD flags are set. The option 'uqnoenforce' should be
shown when only the XFS_UQUOTA_ACCT flag is set. The current code logic
seems wrong, Fix it and show proper options.

Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 799cafa4

fs/xfs/xfs_super.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -490,10 +490,12 @@ xfs_showargs(
		seq_printf(m, ",swidth=%d",
		(int)XFS_FSB_TO_BB(mp, mp->m_swidth));

		if (mp->m_qflags & (XFS_UQUOTA_ACCT\|XFS_UQUOTA_ENFD))
		if (mp->m_qflags & XFS_UQUOTA_ACCT) {
		if (mp->m_qflags & XFS_UQUOTA_ENFD)
		seq_puts(m, ",usrquota");
		else if (mp->m_qflags & XFS_UQUOTA_ACCT)
		else
		seq_puts(m, ",uqnoenforce");
		}

		if (mp->m_qflags & XFS_PQUOTA_ACCT) {
		if (mp->m_qflags & XFS_PQUOTA_ENFD)