Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Lukas Czerner <lczerner@redhat.com>
To:     linux-ext4@vger.kernel.org
Cc:     Theodore Ts'o <tytso@mit.edu>, David Howells <dhowells@redhat.com>,
        Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH 10/17] ext4: clean up return values in handle_mount_opt()
Date:   Wed,  6 Nov 2019 11:14:50 +0100
Message-Id: <20191106101457.11237-11-lczerner@redhat.com>
In-Reply-To: <20191106101457.11237-1-lczerner@redhat.com>
References: <20191106101457.11237-1-lczerner@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Clean up return values in handle_mount_opt() and renabe to function to
ext4_parse_param()

Now we can use is 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 417a929cb0ab..dabb55bb999f 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,
 =09=09=09=09      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 *pa=
ram);
=20
 /*
  * 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)
  */
=20
+static const struct fs_context_operations ext4_context_ops =3D {
+=09.parse_param=09=3D 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 =3D {
 =09.owner=09=09=3D THIS_MODULE,
@@ -1943,7 +1948,7 @@ EXT4_SET_CTX(mount_opt2);
 EXT4_SET_CTX(mount_flags);
=20
=20
-static int handle_mount_opt(struct fs_context *fc, struct fs_parameter *pa=
ram)
+static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *pa=
ram)
 {
 =09struct ext4_fs_context *ctx =3D fc->fs_private;
 =09const struct mount_opts *m;
@@ -1977,19 +1982,19 @@ static int handle_mount_opt(struct fs_context *fc, =
struct fs_parameter *param)
 =09case Opt_removed:
 =09=09ext4_msg(NULL, KERN_WARNING, "Ignoring removed %s option",
 =09=09=09 param->key);
-=09=09return 1;
+=09=09return 0;
 =09case Opt_abort:
 =09=09set_mount_flags(ctx, EXT4_MF_FS_ABORTED);
-=09=09return 1;
+=09=09return 0;
 =09case Opt_i_version:
 =09=09set_flags(ctx, SB_I_VERSION);
-=09=09return 1;
+=09=09return 0;
 =09case Opt_lazytime:
 =09=09set_flags(ctx, SB_LAZYTIME);
-=09=09return 1;
+=09=09return 0;
 =09case Opt_nolazytime:
 =09=09clear_flags(ctx, SB_LAZYTIME);
-=09=09return 1;
+=09=09return 0;
 =09case Opt_errors:
 =09case Opt_data:
 =09case Opt_data_err:
@@ -2185,7 +2190,7 @@ static int handle_mount_opt(struct fs_context *fc, st=
ruct fs_parameter *param)
 =09=09else
 =09=09=09clear_mount_opt(ctx, m->mount_opt);
 =09}
-=09return 1;
+=09return 0;
 }
=20
 static int parse_options(struct fs_context *fc, char *options)
@@ -2223,7 +2228,7 @@ static int parse_options(struct fs_context *fc, char =
*options)
 =09=09=09}
 =09=09}
=20
-=09=09ret =3D handle_mount_opt(fc, &param);
+=09=09ret =3D ext4_parse_param(fc, &param);
 =09=09kfree(param.string);
 =09=09if (ret < 0)
 =09=09=09return ret;
--=20
2.21.0