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>

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index a32fe31c33b8e414c6dffbc30f0e83a38bc85591..650e84398f74426d5e836c95e9c5318cbda63cd0 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -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);

diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c
index dc25823bfed961ebe281cda60eec213fb71f4505..86f42a078d99b0551887de4ddf047a50df6d8ce6 100644 (file)
--- a/fs/unicode/utf8-core.c
+++ b/fs/unicode/utf8-core.c
@@ -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);

diff --git a/include/linux/unicode.h b/include/linux/unicode.h
index 74484d44c7554bdfea1f86a5cebe89809d1bd8e1..6a392cd9f076d46f810d57a7111c6a80514a7044 100644 (file)
--- a/include/linux/unicode.h
+++ b/include/linux/unicode.h
@@ -6,7 +6,6 @@
 #include <linux/dcache.h>
 
 struct unicode_map {
-       const char *charset;
        int version;
 };