diff options
| author | Jan Kara <jack@suse.cz> | 2018-04-16 15:44:19 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2018-04-19 16:00:48 +0200 |
| commit | e966fc8d9953167fe7c29495495436846467a5d2 (patch) | |
| tree | fd2e428de30446512098ea185808807af88db48a /fs/udf/super.c | |
| parent | udf: Use UTF-32 <-> UTF-8 conversion functions from NLS (diff) | |
| download | linux-e966fc8d9953167fe7c29495495436846467a5d2.tar.xz linux-e966fc8d9953167fe7c29495495436846467a5d2.zip | |
udf: Convert ident strings to proper charset
iocharset= mount option specifies the character set used on *console*
(not on disk). So even dstrings from VRS need to be converted from CS0
to the specified charset and not always UTF-8. This is barely user
visible as those strings are shown only in UDF debug messages.
CC: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 37d2565a7f78..0d27d41f5c6e 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -890,14 +890,14 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) #endif } - ret = udf_dstrCS0toUTF8(outstr, 31, pvoldesc->volIdent, 32); + ret = udf_dstrCS0toChar(sb, outstr, 31, pvoldesc->volIdent, 32); if (ret < 0) goto out_bh; strncpy(UDF_SB(sb)->s_volume_ident, outstr, ret); udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident); - ret = udf_dstrCS0toUTF8(outstr, 127, pvoldesc->volSetIdent, 128); + ret = udf_dstrCS0toChar(sb, outstr, 127, pvoldesc->volSetIdent, 128); if (ret < 0) goto out_bh; |