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 16/17] ext4: change token2str() to use ext4_param_specs
Date:   Wed,  6 Nov 2019 11:14:56 +0100
Message-Id: <20191106101457.11237-17-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

Chage token2str() to use ext4_param_specs instead of tokens so that we
can get rid of tokens entirely.

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

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f2f17c11b616..2f3296e81837 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2613,12 +2613,14 @@ static inline void ext4_show_quota_options(struct s=
eq_file *seq,
=20
 static const char *token2str(int token)
 {
-=09const struct match_token *t;
+=09const struct fs_parameter_spec *spec;
=20
-=09for (t =3D tokens; t->token !=3D Opt_err; t++)
-=09=09if (t->token =3D=3D token && !strchr(t->pattern, '=3D'))
+=09for (spec =3D ext4_param_specs; spec->name !=3D NULL; spec++)
+=09=09if (spec->opt =3D=3D token &&
+=09=09    (spec->type =3D=3D fs_param_is_flag ||
+=09=09     spec->type =3D=3D fs_param_is_bool))
 =09=09=09break;
-=09return t->pattern;
+=09return spec->name;
 }
=20
 /*
--=20
2.21.0