From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Winston Wen <wentao@uniontech.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Paulo Alcantara <pc@manguebit.com>,
Christian Brauner <brauner@kernel.org>,
Steve French <stfrench@microsoft.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 5.10 13/25] fs/nls: make load_nls() take a const parameter
Date: Sun, 13 Aug 2023 12:09:24 -0400 [thread overview]
Message-ID: <20230813160936.1082758-13-sashal@kernel.org> (raw)
In-Reply-To: <20230813160936.1082758-1-sashal@kernel.org>
From: Winston Wen <wentao@uniontech.com>
[ 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>
---
fs/nls/nls_base.c | 4 ++--
include/linux/nls.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index 52ccd34b1e792..a026dbd3593f6 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -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);
}
diff --git a/include/linux/nls.h b/include/linux/nls.h
index 499e486b3722d..e0bf8367b274a 100644
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -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)
--
2.40.1
next prev parent reply other threads:[~2023-08-13 16:29 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 16:09 [PATCH AUTOSEL 5.10 01/25] phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 02/25] phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 03/25] media: pulse8-cec: handle possible ping error Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 04/25] media: pci: cx23885: fix error handling for cx23885 ATSC boards Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 05/25] 9p: virtio: make sure 'offs' is initialized in zc_request Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 06/25] ASoC: da7219: Flush pending AAD IRQ when suspending Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 07/25] ASoC: da7219: Check for failure reading AAD IRQ events Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 08/25] ethernet: atheros: fix return value check in atl1c_tso_csum() Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 09/25] vxlan: generalize vxlan_parse_gpe_hdr and remove unused args Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 10/25] m68k: Fix invalid .section syntax Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 11/25] s390/dasd: use correct number of retries for ERP requests Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 12/25] s390/dasd: fix hanging device after request requeue Sasha Levin
2023-08-13 16:09 ` Sasha Levin [this message]
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 14/25] ASoc: codecs: ES8316: Fix DMIC config Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 15/25] ASoC: atmel: Fix the 8K sample parameter in I2SC master Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 16/25] platform/x86: intel: hid: Always call BTNL ACPI method Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 17/25] platform/x86: huawei-wmi: Silence ambient light sensor Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 18/25] spi: spi-qcom-qspi: Add DMA_CHAIN_DONE to ALL_IRQS Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 19/25] drm/amd/display: Exit idle optimizations before attempt to access PHY Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 20/25] ovl: Always reevaluate the file signature for IMA Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 21/25] ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer() Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 22/25] rbd: make get_lock_owner_info() return a single locker or NULL Sasha Levin
2023-08-14 13:23 ` Ilya Dryomov
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 23/25] staging: fbtft: ili9341: use macro FBTFT_REGISTER_SPI_DRIVER Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 24/25] security: keys: perform capable check only on privileged operations Sasha Levin
2023-08-13 16:09 ` [PATCH AUTOSEL 5.10 25/25] kprobes: Prohibit probing on CFI preamble symbol Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230813160936.1082758-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@manguebit.com \
--cc=sfr@canb.auug.org.au \
--cc=stable@vger.kernel.org \
--cc=stfrench@microsoft.com \
--cc=wentao@uniontech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).