From: Brian Foster <bfoster@redhat.com>
To: Ian Kent <raven@themaw.net>
Cc: linux-xfs <linux-xfs@vger.kernel.org>,
Dave Chinner <dchinner@redhat.com>,
David Howells <dhowells@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Eric Sandeen <sandeen@sandeen.net>
Subject: Re: [PATCH v2 05/15] xfs: mount-api - make xfs_parse_param() take context .parse_param() args
Date: Tue, 27 Aug 2019 08:41:20 -0400 [thread overview]
Message-ID: <20190827124120.GD10636@bfoster> (raw)
In-Reply-To: <156652198391.2607.14772471190581142304.stgit@fedora-28>
On Fri, Aug 23, 2019 at 08:59:43AM +0800, Ian Kent wrote:
> Make xfs_parse_param() take arguments of the fs context operation
> .parse_param() in preperation for switching to use the file system
> mount context for mount.
>
> The function fc_parse() only uses the file system context (fc here)
> when calling log macros warnf() and invalf() which in turn check
> only the fc->log field to determine if the message should be saved
> to a context buffer (for later retrival by userspace) or logged
> using printk().
>
> Also the temporary function match_kstrtoint() is now unused, remove it.
>
> Signed-off-by: Ian Kent <raven@themaw.net>
> ---
I see Eric had some feedback on this patch already. Some additional
notes (which may overlap)...
> fs/xfs/xfs_super.c | 187 ++++++++++++++++++++++++++++++----------------------
> 1 file changed, 108 insertions(+), 79 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 3ae29938dd89..754d2ccfd960 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
...
> @@ -275,33 +271,38 @@ xfs_parse_param(
> mp->m_flags |= XFS_MOUNT_NOUUID;
> break;
> case Opt_ikeep:
> - mp->m_flags |= XFS_MOUNT_IKEEP;
> - break;
> - case Opt_noikeep:
> - mp->m_flags &= ~XFS_MOUNT_IKEEP;
> + if (result.negated)
> + mp->m_flags &= ~XFS_MOUNT_IKEEP;
> + else
> + mp->m_flags |= XFS_MOUNT_IKEEP;
> break;
> case Opt_largeio:
> - mp->m_flags &= ~XFS_MOUNT_COMPAT_IOSIZE;
> - break;
> - case Opt_nolargeio:
> - mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
> + if (result.negated)
> + mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
> + else
> + mp->m_flags &= ~XFS_MOUNT_COMPAT_IOSIZE;
> break;
> case Opt_attr2:
> - mp->m_flags |= XFS_MOUNT_ATTR2;
> - break;
> - case Opt_noattr2:
> - mp->m_flags &= ~XFS_MOUNT_ATTR2;
> - mp->m_flags |= XFS_MOUNT_NOATTR2;
> + if (!result.negated) {
> + mp->m_flags |= XFS_MOUNT_ATTR2;
> + } else {
> + mp->m_flags &= ~XFS_MOUNT_ATTR2;
> + mp->m_flags |= XFS_MOUNT_NOATTR2;
> + }
Eric's comments aside, it would be nice to have some consistency between
the various result.negated checks (i.e. 'if (negated)' vs 'if
(!negated)').
> break;
> case Opt_filestreams:
> mp->m_flags |= XFS_MOUNT_FILESTREAMS;
> break;
> - case Opt_noquota:
> - mp->m_qflags &= ~XFS_ALL_QUOTA_ACCT;
> - mp->m_qflags &= ~XFS_ALL_QUOTA_ENFD;
> - mp->m_qflags &= ~XFS_ALL_QUOTA_ACTIVE;
> - break;
> case Opt_quota:
> + if (!result.negated) {
> + mp->m_qflags |= (XFS_UQUOTA_ACCT | XFS_UQUOTA_ACTIVE |
> + XFS_UQUOTA_ENFD);
> + } else {
> + mp->m_qflags &= ~XFS_ALL_QUOTA_ACCT;
> + mp->m_qflags &= ~XFS_ALL_QUOTA_ENFD;
> + mp->m_qflags &= ~XFS_ALL_QUOTA_ACTIVE;
> + }
> + break;
> case Opt_uquota:
> case Opt_usrquota:
> mp->m_qflags |= (XFS_UQUOTA_ACCT | XFS_UQUOTA_ACTIVE |
...
> @@ -367,10 +368,10 @@ xfs_parseargs(
> {
> const struct super_block *sb = mp->m_super;
> char *p;
> - substring_t args[MAX_OPT_ARGS];
> - int dsunit = 0;
> - int dswidth = 0;
> - uint8_t iosizelog = 0;
> +
> + struct fs_context fc;
> + struct xfs_fs_context context;
> + struct xfs_fs_context *ctx = &context;
I don't really see the point for having a separate pointer variable
based on the code so far. Why not just do:
struct xfs_fs_context ctx = {0,};
... and pass by reference where necessary?
>
> /*
> * set up the mount name first so all the errors will refer to the
> @@ -406,17 +407,41 @@ xfs_parseargs(
> if (!options)
> goto done;
>
> + memset(&fc, 0, sizeof(fc));
> + memset(&ctx, 0, sizeof(ctx));
> + fc.fs_private = ctx;
> + fc.s_fs_info = mp;
> +
> while ((p = strsep(&options, ",")) != NULL) {
> - int token;
> - int ret;
> + struct fs_parameter param;
> + char *value;
> + int ret;
>
> if (!*p)
> continue;
>
> - token = match_token(p, tokens, args);
> - ret = xfs_parse_param(token, p, args, mp,
> - &dsunit, &dswidth, &iosizelog);
> - if (ret)
> + param.key = p;
> + param.type = fs_value_is_string;
> + param.size = 0;
> +
> + value = strchr(p, '=');
> + if (value) {
> + if (value == p)
> + continue;
What's the purpose of the above check? Why do we skip the param as
opposed to return an error or something?
> + *value++ = 0;
> + param.size = strlen(value);
> + if (param.size > 0) {
> + param.string = kmemdup_nul(value,
> + param.size,
> + GFP_KERNEL);
> + if (!param.string)
> + return -ENOMEM;
> + }
> + }
> +
> + ret = xfs_parse_param(&fc, ¶m);
> + kfree(param.string);
> + if (ret < 0)
> return ret;
> }
>
...
> @@ -1914,6 +1939,10 @@ static const struct super_operations xfs_super_operations = {
> .free_cached_objects = xfs_fs_free_cached_objects,
> };
>
> +static const struct fs_context_operations xfs_context_ops = {
> + .parse_param = xfs_parse_param,
> +};
> +
It's probably better to introduce this in the first patch where it's used.
Brian
> static struct file_system_type xfs_fs_type = {
> .owner = THIS_MODULE,
> .name = "xfs",
>
next prev parent reply other threads:[~2019-08-27 12:41 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 0:59 [PATCH v2 00/15] xfs: mount API patch series Ian Kent
2019-08-23 0:59 ` [PATCH v2 01/15] vfs: Create fs_context-aware mount_bdev() replacement Ian Kent
2019-08-23 0:59 ` [PATCH v2 02/15] xfs: mount-api - add fs parameter description Ian Kent
2019-08-27 12:39 ` Brian Foster
2019-08-30 10:31 ` Ian Kent
2019-08-30 11:56 ` Brian Foster
2019-09-17 3:13 ` Ian Kent
2019-09-17 12:10 ` Brian Foster
2019-09-18 3:43 ` Ian Kent
2019-09-18 3:49 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 03/15] xfs: mount-api - refactor suffix_kstrtoint() Ian Kent
2019-08-27 12:40 ` Brian Foster
2019-08-30 10:33 ` Ian Kent
2019-09-17 4:31 ` Ian Kent
2019-09-17 12:10 ` Brian Foster
2019-08-23 0:59 ` [PATCH v2 04/15] xfs: mount-api - refactor xfs_parseags() Ian Kent
2019-08-27 12:40 ` Brian Foster
2019-08-23 0:59 ` [PATCH v2 05/15] xfs: mount-api - make xfs_parse_param() take context .parse_param() args Ian Kent
2019-08-26 19:19 ` Eric Sandeen
2019-08-26 19:31 ` Eric Sandeen
2019-08-26 19:32 ` Eric Sandeen
2019-08-30 10:23 ` Ian Kent
2019-08-27 12:41 ` Brian Foster [this message]
2019-08-27 15:10 ` Darrick J. Wong
2019-08-27 15:15 ` Eric Sandeen
2019-08-28 0:55 ` Ian Kent
2019-08-30 10:51 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 06/15] xfs: mount-api - move xfs_parseargs() validation to a helper Ian Kent
2019-08-27 12:41 ` Brian Foster
2019-08-30 10:55 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 07/15] xfs: mount-api - refactor xfs_fs_fill_super() Ian Kent
2019-08-27 12:42 ` Brian Foster
2019-08-30 10:56 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 08/15] xfs: mount-api - add xfs_get_tree() Ian Kent
2019-08-28 13:27 ` Brian Foster
2019-08-30 11:01 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 09/15] xfs: mount-api - add xfs_remount_rw() helper Ian Kent
2019-08-28 13:27 ` Brian Foster
2019-08-23 1:00 ` [PATCH v2 10/15] xfs: mount-api - add xfs_remount_ro() helper Ian Kent
2019-08-28 13:27 ` Brian Foster
2019-08-23 1:00 ` [PATCH v2 11/15] xfs: mount api - add xfs_reconfigure() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-30 11:10 ` Ian Kent
2019-08-30 11:56 ` Brian Foster
2019-09-02 2:41 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 12/15] xfs: mount-api - add xfs_fc_free() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-30 11:19 ` Ian Kent
2019-08-30 11:20 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 13/15] xfs: mount-api - dont set sb in xfs_mount_alloc() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-23 1:00 ` [PATCH v2 14/15] xfs: mount-api - switch to new mount-api Ian Kent
2019-08-28 13:29 ` Brian Foster
2019-08-28 13:34 ` Eric Sandeen
2019-08-30 11:30 ` Ian Kent
2019-08-30 11:27 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 15/15] xfs: mount-api - remove legacy mount functions Ian Kent
2019-08-26 19:33 ` [PATCH v2 00/15] xfs: mount API patch series Darrick J. Wong
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=20190827124120.GD10636@bfoster \
--to=bfoster@redhat.com \
--cc=dchinner@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=raven@themaw.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).