summary refs log tree commit diff
path: root/fs/isofs/isofs.h
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2021-08-08 18:24:37 +0200
committerJan Kara <jack@suse.cz>2021-08-12 16:07:14 +0200
commit28ce50f8d96ec9035f60c9348294ea26b94db944 (patch)
treeedd97edb8dea044d3474ad96773ea65a17cbd480 /fs/isofs/isofs.h
parentb645333443712d2613e4e863f81090d5dc509657 (diff)
downloadlinux-28ce50f8d96ec9035f60c9348294ea26b94db944.tar.gz
isofs: joliet: 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_iocharset is set to NULL. So
simplify code around, remove s_utf8 field as to distinguish between UTF-8
and non-UTF-8 it is needed just to check if s_nls_iocharset is set to NULL
or not.

Link: https://lore.kernel.org/r/20210808162453.1653-5-pali@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/isofs/isofs.h')
-rw-r--r--fs/isofs/isofs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index 055ec6c586f7..dcdc191ed183 100644
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -44,7 +44,6 @@ struct isofs_sb_info {
 	unsigned char s_session;
 	unsigned int  s_high_sierra:1;
 	unsigned int  s_rock:2;
-	unsigned int  s_utf8:1;
 	unsigned int  s_cruft:1; /* Broken disks with high byte of length
 				  * containing junk */
 	unsigned int  s_nocompress:1;