Commit a440943e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Gabriel Krisman Bertazi
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
parent 86e80575

fs/f2fs/sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

fs/unicode/utf8-core.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/unicode.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/dcache.h>



struct unicode_map {

	const char *charset;

	int version;

};