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

Commit 13c2fe5c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit b796adfc which is
commit c1ed39ec116272935528ca9b348b8ee79b0791da upstream.

It changes the signature of a ABI-frozen function, while nice to have,
isn't actually needed right now, so revert it to preserve the Android
abi.

Bug: 161946584
Change-Id: I49f5124db00ac2aedd5d96c3aedde80c4ad11664
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 4d59a2c9

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(const char *charset)

static struct nls_table *find_nls(char *charset)

{

	struct nls_table *nls;

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

}



struct nls_table *load_nls(const char *charset)

struct nls_table *load_nls(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(const char *charset);

extern struct nls_table *load_nls(char *);

extern void unload_nls(struct nls_table *);

extern struct nls_table *load_nls_default(void);

#define register_nls(nls) __register_nls((nls), THIS_MODULE)