From: Lukas Czerner <lczerner@redhat.com>
To: linux-ext4@vger.kernel.org
Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk
Subject: [PATCH v2 10/17] ext4: clean up return values in handle_mount_opt()
Date: Tue, 28 Apr 2020 18:45:29 +0200 [thread overview]
Message-ID: <20200428164536.462-11-lczerner@redhat.com> (raw)
In-Reply-To: <20200428164536.462-1-lczerner@redhat.com>
Clean up return values in handle_mount_opt() and rename the function to
ext4_parse_param()
Now we can use it in fs_context_operations as .parse_param.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
fs/ext4/super.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ea7c8f7d4c7c..81238dddc3b7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -92,6 +92,7 @@ static int ext4_validate_options(struct fs_context *fc);
static int ext4_check_opt_consistency(struct fs_context *fc,
struct super_block *sb);
static void ext4_apply_options(struct fs_context *fc, struct super_block *sb);
+static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param);
/*
* Lock ordering
@@ -121,6 +122,10 @@ static void ext4_apply_options(struct fs_context *fc, struct super_block *sb);
* transaction start -> page lock(s) -> i_data_sem (rw)
*/
+static const struct fs_context_operations ext4_context_ops = {
+ .parse_param = ext4_parse_param,
+};
+
#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT2)
static struct file_system_type ext2_fs_type = {
.owner = THIS_MODULE,
@@ -2028,7 +2033,7 @@ EXT4_SET_CTX(mount_opt2);
EXT4_SET_CTX(mount_flags);
-static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
+static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param)
{
struct ext4_fs_context *ctx = fc->fs_private;
const struct mount_opts *m;
@@ -2062,19 +2067,19 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
case Opt_removed:
ext4_msg(NULL, KERN_WARNING, "Ignoring removed %s option",
param->key);
- return 1;
+ return 0;
case Opt_abort:
set_mount_flags(ctx, EXT4_MF_FS_ABORTED);
- return 1;
+ return 0;
case Opt_i_version:
set_flags(ctx, SB_I_VERSION);
- return 1;
+ return 0;
case Opt_lazytime:
set_flags(ctx, SB_LAZYTIME);
- return 1;
+ return 0;
case Opt_nolazytime:
clear_flags(ctx, SB_LAZYTIME);
- return 1;
+ return 0;
case Opt_errors:
case Opt_data:
case Opt_data_err:
@@ -2275,7 +2280,7 @@ static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *param)
else
clear_mount_opt(ctx, m->mount_opt);
}
- return 1;
+ return 0;
}
static int parse_options(struct fs_context *fc, char *options)
@@ -2311,7 +2316,7 @@ static int parse_options(struct fs_context *fc, char *options)
param.key = key;
param.size = v_len;
- ret = handle_mount_opt(fc, ¶m);
+ ret = ext4_parse_param(fc, ¶m);
if (param.string)
kfree(param.string);
if (ret < 0)
--
2.21.1
next prev parent reply other threads:[~2020-04-28 16:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 16:45 [PATCH v2 00/17] ext4: new mount API conversion Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 01/17] fs_parse: allow parameter value to be empty Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 02/17] ext4: Add fs parameter specifications for mount options Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 03/17] ext4: move option validation to a separate function Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 04/17] ext4: Change handle_mount_opt() to use fs_parameter Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 05/17] ext4: Allow sb to be NULL in ext4_msg() Lukas Czerner
2020-04-28 16:48 ` Christoph Hellwig
2020-04-28 16:57 ` Lukas Czerner
2020-04-29 2:53 ` Ian Kent
2020-04-29 11:09 ` Christoph Hellwig
2020-04-29 2:38 ` Eric Sandeen
2020-04-29 11:02 ` Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 06/17] ext4: move quota configuration out of handle_mount_opt() Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 07/17] ext4: check ext2/3 compatibility outside handle_mount_opt() Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 08/17] ext4: get rid of super block and sbi from handle_mount_ops() Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 09/17] ext4: parse Opt_sb in handle_mount_opt() Lukas Czerner
2020-04-28 16:45 ` Lukas Czerner [this message]
2020-04-28 16:45 ` [PATCH v2 11/17] ext4: add ext4_get_tree for the new mount API Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 12/17] ext4: refactor ext4_remount() Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 13/17] ext4: add ext4_reconfigure for the new mount API Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 14/17] ext4: add ext4_fc_free " Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 15/17] ext4: change token2str() to use ext4_param_specs Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 16/17] ext4: switch to the new mount API Lukas Czerner
2020-04-28 16:45 ` [PATCH v2 17/17] ext4: Remove unused code from old mount api Lukas Czerner
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=20200428164536.462-11-lczerner@redhat.com \
--to=lczerner@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--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.