leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unicode: remove the charset field from struct unicode_map

Browse Source 
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:
Christoph Hellwig 2021-09-15 08:59:58 +02:00 committed by Gabriel Krisman Bertazi
parent 86e8057579
commit a440943e68
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/sysfs.c
View File

@ -196,8 +196,7 @@ static ssize_t encoding_show(struct f2fs_attr *a,
struct super_block *sb = sbi->sb; struct super_block *sb = sbi->sb;
if (f2fs_sb_has_casefold(sbi)) if (f2fs_sb_has_casefold(sbi))
return snprintf(buf, PAGE_SIZE, "%s (%d.%d.%d)\n", return snprintf(buf, PAGE_SIZE, "UTF-8 (%d.%d.%d)\n",
sb->s_encoding->charset,
(sb->s_encoding->version >> 16) & 0xff, (sb->s_encoding->version >> 16) & 0xff,
(sb->s_encoding->version >> 8) & 0xff, (sb->s_encoding->version >> 8) & 0xff,
sb->s_encoding->version & 0xff); sb->s_encoding->version & 0xff);

3
fs/unicode/utf8-core.c
View File

@ -219,10 +219,7 @@ struct unicode_map *utf8_load(const char *version)
um = kzalloc(sizeof(struct unicode_map), GFP_KERNEL); um = kzalloc(sizeof(struct unicode_map), GFP_KERNEL);
if (!um) if (!um)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
um->charset = "UTF-8";
um->version = unicode_version; um->version = unicode_version;
return um; return um;
} }
EXPORT_SYMBOL(utf8_load); EXPORT_SYMBOL(utf8_load);

1
include/linux/unicode.h
View File

@ -6,7 +6,6 @@
#include <linux/dcache.h> #include <linux/dcache.h>
struct unicode_map { struct unicode_map {
const char *charset;
int version; int version;
}; };