On Fri, Nov 01, 2019 at 03:50:13PM +0800, Ian Kent wrote:
> 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@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_super.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 6438738a204a..fb90beeb3184 100644
> --- 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)) {
>
