mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
unicode: remove the charset field from struct unicode_map
It is hardcoded and only used for a f2fs sysfs file where it can be hardcoded just as easily. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
This commit is contained in:
parent
86e8057579
commit
a440943e68
@ -196,8 +196,7 @@ static ssize_t encoding_show(struct f2fs_attr *a,
|
||||
struct super_block *sb = sbi->sb;
|
||||
|
||||
if (f2fs_sb_has_casefold(sbi))
|
||||
return snprintf(buf, PAGE_SIZE, "%s (%d.%d.%d)\n",
|
||||
sb->s_encoding->charset,
|
||||
return snprintf(buf, PAGE_SIZE, "UTF-8 (%d.%d.%d)\n",
|
||||
(sb->s_encoding->version >> 16) & 0xff,
|
||||
(sb->s_encoding->version >> 8) & 0xff,
|
||||
sb->s_encoding->version & 0xff);
|
||||
|
@ -219,10 +219,7 @@ struct unicode_map *utf8_load(const char *version)
|
||||
um = kzalloc(sizeof(struct unicode_map), GFP_KERNEL);
|
||||
if (!um)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
um->charset = "UTF-8";
|
||||
um->version = unicode_version;
|
||||
|
||||
return um;
|
||||
}
|
||||
EXPORT_SYMBOL(utf8_load);
|
||||
|
@ -6,7 +6,6 @@
|
||||
#include <linux/dcache.h>
|
||||
|
||||
struct unicode_map {
|
||||
const char *charset;
|
||||
int version;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user