xfs: dont use XFS_IS_QUOTA_RUNNING() for option check

When CONFIG_XFS_QUOTA is not defined any quota option is invalid.

Using the macro XFS_IS_QUOTA_RUNNING() as a check if any quota option
has been given is a little misleading so use a simple m_qflags != 0
check to make the intended use more explicit.

Also change to use the IS_ENABLED() macro for the kernel config check.

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 6438738a204af281b4220ba12df148d91cb6ceda..fb90beeb3184fb0dd5e943ccb8f496a54cb94c33 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -341,12 +341,10 @@ xfs_parseargs(
                return -EINVAL;
        }
 
-#ifndef CONFIG_XFS_QUOTA
-       if (XFS_IS_QUOTA_RUNNING(mp)) {
+       if (!IS_ENABLED(CONFIG_XFS_QUOTA) && mp->m_qflags != 0) {
                xfs_warn(mp, "quota support not available in this kernel.");
                return -EINVAL;
        }
-#endif
 
        if ((mp->m_dalign && !mp->m_swidth) ||
            (!mp->m_dalign && mp->m_swidth)) {