| Message ID | 157118646832.9678.14900204464012668551.stgit@fedora-28 (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: mount API patch series | expand |
On Wed, Oct 16, 2019 at 08:41:08AM +0800, Ian Kent wrote: > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index 5876c2b551b5..f8770206b66e 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -349,7 +349,7 @@ xfs_parseargs( > } > > #ifndef CONFIG_XFS_QUOTA > - if (XFS_IS_QUOTA_RUNNING(mp)) { > + if (mp->m_qflags != 0) { > xfs_warn(mp, "quota support not available in this kernel."); > return -EINVAL; > } Please also convert to use !IS_ENABLED while you are at it.
On Wed, Oct 16, 2019 at 08:41:08AM +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. > > Signed-off-by: Ian Kent <raven@themaw.net> With hch's comments addressed, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_super.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index 5876c2b551b5..f8770206b66e 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -349,7 +349,7 @@ xfs_parseargs( > } > > #ifndef CONFIG_XFS_QUOTA > - if (XFS_IS_QUOTA_RUNNING(mp)) { > + if (mp->m_qflags != 0) { > xfs_warn(mp, "quota support not available in this kernel."); > return -EINVAL; > } >
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 5876c2b551b5..f8770206b66e 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -349,7 +349,7 @@ xfs_parseargs( } #ifndef CONFIG_XFS_QUOTA - if (XFS_IS_QUOTA_RUNNING(mp)) { + if (mp->m_qflags != 0) { xfs_warn(mp, "quota support not available in this kernel."); return -EINVAL; }
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. Signed-off-by: Ian Kent <raven@themaw.net> --- fs/xfs/xfs_super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)