diff options
| author | Pali Rohár <pali@kernel.org> | 2021-08-08 18:24:36 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2021-08-12 16:07:09 +0200 |
| commit | b645333443712d2613e4e863f81090d5dc509657 (patch) | |
| tree | 97974b76a049447e0db6e25104851d46a13fcb91 /fs/udf/unicode.c | |
| parent | 979a6e28dd969a2222545001f79566b4bfaf06c0 (diff) | |
| download | linux-stable-b645333443712d2613e4e863f81090d5dc509657.tar.gz linux-stable-b645333443712d2613e4e863f81090d5dc509657.tar.bz2 linux-stable-b645333443712d2613e4e863f81090d5dc509657.zip | |
udf: Fix iocharset=utf8 mount option
Currently iocharset=utf8 mount option is broken. To use UTF-8 as iocharset,
it is required to use utf8 mount option.
Fix iocharset=utf8 mount option to use be equivalent to the utf8 mount
option.
If UTF-8 as iocharset is used then s_nls_map is set to NULL. So simplify
code around, remove UDF_FLAG_NLS_MAP and UDF_FLAG_UTF8 flags as to
distinguish between UTF-8 and non-UTF-8 it is needed just to check if
s_nls_map set to NULL or not.
Link: https://lore.kernel.org/r/20210808162453.1653-4-pali@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/unicode.c')
| -rw-r--r-- | fs/udf/unicode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index 5fcfa96463eb..622569007b53 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c @@ -177,7 +177,7 @@ static int udf_name_from_CS0(struct super_block *sb, return 0; } - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) + if (UDF_SB(sb)->s_nls_map) conv_f = UDF_SB(sb)->s_nls_map->uni2char; else conv_f = NULL; @@ -285,7 +285,7 @@ static int udf_name_to_CS0(struct super_block *sb, if (ocu_max_len <= 0) return 0; - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) + if (UDF_SB(sb)->s_nls_map) conv_f = UDF_SB(sb)->s_nls_map->char2uni; else conv_f = NULL; |