Commit 3d9d60d9 authored by Ian Kent's avatar Ian Kent Committed by Darrick J. Wong

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: default avatarIan Kent <raven@themaw.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent e1d3d218
...@@ -341,12 +341,10 @@ xfs_parseargs( ...@@ -341,12 +341,10 @@ xfs_parseargs(
return -EINVAL; return -EINVAL;
} }
#ifndef CONFIG_XFS_QUOTA if (!IS_ENABLED(CONFIG_XFS_QUOTA) && mp->m_qflags != 0) {
if (XFS_IS_QUOTA_RUNNING(mp)) {
xfs_warn(mp, "quota support not available in this kernel."); xfs_warn(mp, "quota support not available in this kernel.");
return -EINVAL; return -EINVAL;
} }
#endif
if ((mp->m_dalign && !mp->m_swidth) || if ((mp->m_dalign && !mp->m_swidth) ||
(!mp->m_dalign && mp->m_swidth)) { (!mp->m_dalign && mp->m_swidth)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment