From: Linus Torvalds Date: Mon, 17 Jan 2022 03:40:02 +0000 (+0200) Subject: Merge tag 'unicode-for-next-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6661224e66f03706daea8e27714436851cf01731;p=linux.git Merge tag 'unicode-for-next-5.17' of git://git./linux/kernel/git/krisman/unicode Pull unicode updates from Gabriel Krisman Bertazi: "This includes patches from Christoph Hellwig to split the large data tables of the unicode subsystem into a loadable module, which allow users to not have them around if case-insensitive filesystems are not to be used. It also includes minor code fixes to unicode and its users, from the same author. All the patches here have been on linux-next releases for the past months" * tag 'unicode-for-next-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode: unicode: only export internal symbols for the selftests unicode: Add utf8-data module unicode: cache the normalization tables in struct unicode_map unicode: move utf8cursor to utf8-selftest.c unicode: simplify utf8len unicode: remove the unused utf8{,n}age{min,max} functions unicode: pass a UNICODE_AGE() tripple to utf8_load unicode: mark the version field in struct unicode_map unsigned unicode: remove the charset field from struct unicode_map f2fs: simplify f2fs_sb_read_encoding ext4: simplify ext4_sb_read_encoding --- 6661224e66f03706daea8e27714436851cf01731 diff --cc fs/f2fs/sysfs.c index 7d289249cd7eb,650e84398f744..8408f77764e85 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@@ -196,8 -196,7 +196,7 @@@ static ssize_t encoding_show(struct f2f struct super_block *sb = sbi->sb; if (f2fs_sb_has_casefold(sbi)) - return sysfs_emit(buf, "%s (%d.%d.%d)\n", - sb->s_encoding->charset, - return snprintf(buf, PAGE_SIZE, "UTF-8 (%d.%d.%d)\n", ++ return sysfs_emit(buf, "UTF-8 (%d.%d.%d)\n", (sb->s_encoding->version >> 16) & 0xff, (sb->s_encoding->version >> 8) & 0xff, sb->s_encoding->version & 0xff);