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 12/17] ext4: refactor ext4_remount()
Date:   Wed,  6 Nov 2019 11:14:52 +0100
Message-Id: <20191106101457.11237-13-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

Refactor ext4_remount() so that we can parse mount options separately.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 fs/ext4/super.c | 62 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 76f7d742de8e..f863fddc3df3 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5801,8 +5801,10 @@ struct ext4_mount_options {
 #endif
 };
=20
-static int ext4_remount(struct super_block *sb, int *flags, char *data)
+static int __ext4_remount(struct fs_context *fc, struct super_block *sb,
+=09=09=09  int *flags)
 {
+=09struct ext4_fs_context *ctx =3D fc->fs_private;
 =09struct ext4_super_block *es;
 =09struct ext4_sb_info *sbi =3D EXT4_SB(sb);
 =09unsigned long old_sb_flags;
@@ -5815,10 +5817,6 @@ static int ext4_remount(struct super_block *sb, int =
*flags, char *data)
 =09int i, j;
 =09char *to_free[EXT4_MAXQUOTAS];
 #endif
-=09char *orig_data =3D kstrdup(data, GFP_KERNEL);
-
-=09if (data && !orig_data)
-=09=09return -ENOMEM;
=20
 =09/* Store the original options */
 =09old_sb_flags =3D sb->s_flags;
@@ -5839,7 +5837,6 @@ static int ext4_remount(struct super_block *sb, int *=
flags, char *data)
 =09=09=09if (!old_opts.s_qf_names[i]) {
 =09=09=09=09for (j =3D 0; j < i; j++)
 =09=09=09=09=09kfree(old_opts.s_qf_names[j]);
-=09=09=09=09kfree(orig_data);
 =09=09=09=09return -ENOMEM;
 =09=09=09}
 =09=09} else
@@ -5848,10 +5845,10 @@ static int ext4_remount(struct super_block *sb, int=
 *flags, char *data)
 =09if (sbi->s_journal && sbi->s_journal->j_task->io_context)
 =09=09journal_ioprio =3D sbi->s_journal->j_task->io_context->ioprio;
=20
-=09if (!parse_apply_options(data, sb, NULL, &journal_ioprio, 1)) {
-=09=09err =3D -EINVAL;
-=09=09goto restore_opts;
-=09}
+=09if (ctx->spec & EXT4_SPEC_JOURNAL_IOPRIO)
+=09=09journal_ioprio =3D ctx->journal_ioprio;
+
+=09ext4_apply_options(fc, sb);
=20
 =09ext4_clamp_want_extra_isize(sb);
=20
@@ -6050,8 +6047,6 @@ static int ext4_remount(struct super_block *sb, int *=
flags, char *data)
 #endif
=20
 =09*flags =3D (*flags & ~SB_LAZYTIME) | (sb->s_flags & SB_LAZYTIME);
-=09ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
-=09kfree(orig_data);
 =09return 0;
=20
 restore_opts:
@@ -6073,10 +6068,51 @@ static int ext4_remount(struct super_block *sb, int=
 *flags, char *data)
 =09for (i =3D 0; i < EXT4_MAXQUOTAS; i++)
 =09=09kfree(to_free[i]);
 #endif
-=09kfree(orig_data);
 =09return err;
 }
=20
+static int ext4_remount(struct super_block *sb, int *flags, char *data)
+{
+=09struct ext4_sb_info *sbi =3D EXT4_SB(sb);
+=09struct ext4_fs_context ctx;
+=09struct fs_context fc;
+=09char *orig_data;
+=09int ret;
+
+=09orig_data =3D kstrdup(data, GFP_KERNEL);
+=09if (data && !orig_data)
+=09=09return -ENOMEM;
+
+=09memset(&fc, 0, sizeof(fc));
+=09memset(&ctx, 0, sizeof(ctx));
+
+=09fc.fs_private =3D &ctx;
+=09fc.purpose =3D FS_CONTEXT_FOR_RECONFIGURE;
+=09fc.s_fs_info =3D sbi;
+
+=09ret =3D parse_options(&fc, (char *) data);
+=09if (ret < 0)
+=09=09goto err_out;
+
+=09ret =3D ext4_check_opt_consistency(&fc, sb);
+=09if (ret < 0)
+=09=09goto err_out;
+
+=09ret =3D __ext4_remount(&fc, sb, flags);
+=09if (ret < 0)
+=09=09goto err_out;
+
+=09ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
+=09cleanup_ctx(&ctx);
+=09kfree(orig_data);
+=09return 0;
+
+err_out:
+=09cleanup_ctx(&ctx);
+=09kfree(orig_data);
+=09return ret;
+}
+
 #ifdef CONFIG_QUOTA
 static int ext4_statfs_project(struct super_block *sb,
 =09=09=09       kprojid_t projid, struct kstatfs *buf)
--=20
2.21.0