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 07/17] ext4: check ext2/3 compatibility outside handle_mount_opt()
Date:   Wed,  6 Nov 2019 11:14:47 +0100
Message-Id: <20191106101457.11237-8-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

At the parsing phase of mount in the new mount api sb will not be
available so move ext2/3 compatibility check outside handle_mount_opt().
Unfortunately we will lose the ability to show exactly which option is
not compatible.

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

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index affcdaf63b6e..d515506d18a0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -89,8 +89,8 @@ static void ext4_clear_request_list(void);
 static struct inode *ext4_get_journal_inode(struct super_block *sb,
 =09=09=09=09=09    unsigned int journal_inum);
 static int ext4_validate_options(struct fs_context *fc);
-static int ext4_check_quota_consistency(struct fs_context *fc,
-=09=09=09=09=09struct super_block *sb);
+static int ext4_check_opt_consistency(struct fs_context *fc,
+=09=09=09=09      struct super_block *sb);
 static void ext4_apply_quota_options(struct fs_context *fc,
 =09=09=09=09     struct super_block *sb);
=20
@@ -1845,6 +1845,7 @@ struct ext4_fs_context {
 =09unsigned short=09qname_spec;
 =09unsigned long=09journal_devnum;
 =09unsigned int=09journal_ioprio;
+=09unsigned int=09opt_flags;=09/* MOPT flags */
 };
=20
 #ifdef CONFIG_QUOTA
@@ -1965,25 +1966,14 @@ static int handle_mount_opt(struct fs_context *fc, =
struct fs_parameter *param)
 =09=09if (token =3D=3D m->token)
 =09=09=09break;
=20
+=09ctx->opt_flags |=3D m->flags;
+
 =09if (m->token =3D=3D Opt_err) {
 =09=09ext4_msg(NULL, KERN_ERR, "Unrecognized mount option \"%s\" "
 =09=09=09 "or missing value", param->key);
 =09=09return -EINVAL;
 =09}
=20
-=09if ((m->flags & MOPT_NO_EXT2) && IS_EXT2_SB(sb)) {
-=09=09ext4_msg(NULL, KERN_ERR,
-=09=09=09 "Mount option \"%s\" incompatible with ext2",
-=09=09=09 param->string);
-=09=09return -EINVAL;
-=09}
-=09if ((m->flags & MOPT_NO_EXT3) && IS_EXT3_SB(sb)) {
-=09=09ext4_msg(NULL, KERN_ERR,
-=09=09=09 "Mount option \"%s\" incompatible with ext3",
-=09=09=09 param->string);
-=09=09return -EINVAL;
-=09}
-
 =09if (m->flags & MOPT_EXPLICIT) {
 =09=09if (m->mount_opt & EXT4_MOUNT_DELALLOC) {
 =09=09=09set_opt2(sb, EXPLICIT_DELALLOC);
@@ -2212,7 +2202,7 @@ static int parse_options(char *options, struct super_=
block *sb,
 =09if (ret < 0)
 =09=09return 0;
=20
-=09ret =3D ext4_check_quota_consistency(&fc, sb);
+=09ret =3D ext4_check_opt_consistency(&fc, sb);
 =09if (ret < 0)
 =09=09return 0;
=20
@@ -2305,6 +2295,25 @@ static int ext4_check_quota_consistency(struct fs_co=
ntext *fc,
 #endif
 }
=20
+static int ext4_check_opt_consistency(struct fs_context *fc,
+=09=09=09=09      struct super_block *sb)
+{
+=09struct ext4_fs_context *ctx =3D fc->fs_private;
+
+=09if ((ctx->opt_flags & MOPT_NO_EXT2) && IS_EXT2_SB(sb)) {
+=09=09ext4_msg(NULL, KERN_ERR,
+=09=09=09 "Mount option(s) incompatible with ext2");
+=09=09return -EINVAL;
+=09}
+=09if ((ctx->opt_flags & MOPT_NO_EXT3) && IS_EXT3_SB(sb)) {
+=09=09ext4_msg(NULL, KERN_ERR,
+=09=09=09 "Mount option(s) incompatible with ext3");
+=09=09return -EINVAL;
+=09}
+
+=09return ext4_check_quota_consistency(fc, sb);
+}
+
 static int ext4_validate_options(struct fs_context *fc)
 {
 =09struct ext4_sb_info *sbi =3D fc->s_fs_info;
--=20
2.21.0