Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b796adfc authored Jul 24, 2023 by Winston Wen Committed by Greg Kroah-Hartman Sep 23, 2023

fs/nls: make load_nls() take a const parameter



[ Upstream commit c1ed39ec116272935528ca9b348b8ee79b0791da ]

load_nls() take a char * parameter, use it to find nls module in list or
construct the module name to load it.

This change make load_nls() take a const parameter, so we don't need do
some cast like this:

        ses->local_nls = load_nls((char *)ctx->local_nls->charset);

Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Winston Wen <wentao@uniontech.com>
Reviewed-by: Paulo Alcantara <pc@manguebit.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 35a9b057

fs/nls/nls_base.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ int unregister_nls(struct nls_table * nls)
		return -EINVAL;
		}

		static struct nls_table find_nls(char charset)
		static struct nls_table find_nls(const char charset)
		{
		struct nls_table *nls;
		spin_lock(&nls_lock);
		@@ -288,7 +288,7 @@ static struct nls_table find_nls(char charset)
		return nls;
		}

		struct nls_table load_nls(char charset)
		struct nls_table load_nls(const char charset)
		{
		return try_then_request_module(find_nls(charset), "nls_%s", charset);
		}

include/linux/nls.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ enum utf16_endian {
		/* nls_base.c */
		extern int __register_nls(struct nls_table , struct module );
		extern int unregister_nls(struct nls_table *);
		extern struct nls_table load_nls(char );
		extern struct nls_table load_nls(const char charset);
		extern void unload_nls(struct nls_table *);
		extern struct nls_table *load_nls_default(void);
		#define register_nls(nls) __register_nls((nls), THIS_MODULE)