Commit 237d7887 authored Dec 03, 2020 by Kaixu Xia Committed by Darrick J. Wong Dec 09, 2020

xfs: show the proper user quota options



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>

parent afbd9147

fs/xfs/xfs_super.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -199,10 +199,12 @@ xfs_fs_show_options(
		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)

Admin message