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 03/17] ext4: move option validation to a separate function
Date:   Wed,  6 Nov 2019 11:14:43 +0100
Message-Id: <20191106101457.11237-4-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

Move option validation out of parse_options() into a separate function
ext4_validate_options().

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

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 44254179bd4f..b155257e2a4e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -88,6 +88,7 @@ static void ext4_unregister_li_request(struct super_block=
 *sb);
 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 super_block *sb);
=20
 /*
  * Lock ordering
@@ -2160,10 +2161,9 @@ static int parse_options(char *options, struct super=
_block *sb,
 =09=09=09 unsigned int *journal_ioprio,
 =09=09=09 int is_remount)
 {
-=09struct ext4_sb_info *sbi =3D EXT4_SB(sb);
-=09char *p, __maybe_unused *usr_qf_name, __maybe_unused *grp_qf_name;
 =09substring_t args[MAX_OPT_ARGS];
 =09int token;
+=09char *p;
=20
 =09if (!options)
 =09=09return 1;
@@ -2181,7 +2181,14 @@ static int parse_options(char *options, struct super=
_block *sb,
 =09=09=09=09     journal_ioprio, is_remount) < 0)
 =09=09=09return 0;
 =09}
+=09return ext4_validate_options(sb);
+}
+
+static int ext4_validate_options(struct super_block *sb)
+{
+=09struct ext4_sb_info *sbi =3D EXT4_SB(sb);
 #ifdef CONFIG_QUOTA
+=09char *usr_qf_name, *grp_qf_name;
 =09/*
 =09 * We do the test below only for project quotas. 'usrquota' and
 =09 * 'grpquota' mount options are allowed even without quota feature
--=20
2.21.0