All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Kent <raven@themaw.net>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>,
	"Darrick J. Wong" <darrick.wong@oracle.com>,
	Brian Foster <bfoster@redhat.com>,
	Eric Sandeen <sandeen@sandeen.net>,
	David Howells <dhowells@redhat.com>,
	Dave Chinner <dchinner@redhat.com>,
	Al Viro <viro@ZenIV.linux.org.uk>
Subject: [PATCH v8 03/16] xfs: dont use XFS_IS_QUOTA_RUNNING() for option check
Date: Fri, 01 Nov 2019 15:50:13 +0800	[thread overview]
Message-ID: <157259461351.28278.7899654768801700302.stgit@fedora-28> (raw)
In-Reply-To: <157259452909.28278.1001302742832626046.stgit@fedora-28>

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>
---
 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)) {


  parent reply	other threads:[~2019-11-01  7:50 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-01  7:49 [PATCH v8 00/16] xfs: mount API patch series Ian Kent
2019-11-01  7:50 ` [PATCH v8 01/16] xfs: remove unused struct xfs_mount field m_fsname_len Ian Kent
2019-11-01  7:50 ` [PATCH v8 02/16] xfs: use super s_id instead of struct xfs_mount m_fsname Ian Kent
2019-11-01  7:50 ` Ian Kent [this message]
2019-11-01 17:01   ` [PATCH v8 03/16] xfs: dont use XFS_IS_QUOTA_RUNNING() for option check Christoph Hellwig
2019-11-01 18:50   ` Darrick J. Wong
2019-11-01  7:50 ` [PATCH v8 04/16] xfs: use kmem functions for struct xfs_mount Ian Kent
2019-11-01  7:50 ` [PATCH v8 05/16] xfs: merge freeing of mp names and mp Ian Kent
2019-11-01  7:50 ` [PATCH v8 06/16] xfs: add xfs_remount_rw() helper Ian Kent
2019-11-01 19:35   ` Darrick J. Wong
2019-11-01  7:50 ` [PATCH v8 07/16] xfs: add xfs_remount_ro() helper Ian Kent
2019-11-01 19:35   ` Darrick J. Wong
2019-11-01  7:50 ` [PATCH v8 08/16] xfs: refactor suffix_kstrtoint() Ian Kent
2019-11-01 19:35   ` Darrick J. Wong
2019-11-01  7:50 ` [PATCH v8 09/16] xfs: avoid redundant checks when options is empty Ian Kent
2019-11-01  7:50 ` [PATCH v8 10/16] xfs: refactor xfs_parseags() Ian Kent
2019-11-01  7:51 ` [PATCH v8 11/16] xfs: move xfs_parseargs() validation to a helper Ian Kent
2019-11-01 17:03   ` Christoph Hellwig
2019-11-01  7:51 ` [PATCH v8 12/16] xfs: dont set sb in xfs_mount_alloc() Ian Kent
2019-11-01 20:15   ` Darrick J. Wong
2019-11-02  4:41     ` Ian Kent
2019-11-04 21:12       ` Darrick J. Wong
2019-11-05  2:47         ` Ian Kent
2019-11-01  7:51 ` [PATCH v8 13/16] xfs: switch to use the new mount-api Ian Kent
2019-11-02 16:18   ` Christoph Hellwig
2019-11-01  7:51 ` [PATCH v8 14/16] xfs: move xfs_fc_reconfigure() above xfs_fc_free() Ian Kent
2019-11-01 20:16   ` Darrick J. Wong
2019-11-02  4:48     ` Ian Kent
2019-11-02 16:19   ` Christoph Hellwig
2019-11-01  7:51 ` [PATCH v8 15/16] xfs: move xfs_fc_get_tree() above xfs_fc_reconfigure() Ian Kent
2019-11-01 20:17   ` Darrick J. Wong
2019-11-02 16:19   ` Christoph Hellwig
2019-11-01  7:51 ` [PATCH v8 16/16] xfs: move xfs_fc_parse_param() above xfs_fc_get_tree() Ian Kent
2019-11-01 20:17   ` Darrick J. Wong
2019-11-02 16:19   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=157259461351.28278.7899654768801700302.stgit@fedora-28 \
    --to=raven@themaw.net \
    --cc=bfoster@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=dchinner@redhat.com \
    --cc=dhowells@redhat.com \
    --cc=hch@infradead.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    --cc=viro@ZenIV.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.