2017-08-13 21:16:13

by Thomas Petazzoni

[permalink] [raw]
Subject: [PATCH] fs/isofs: ISO9660_FS now needs NLS support

Since 86a1da6d30ad7 ("isofs: Implement show_options"),
fs/isofs/inode.c uses CONFIG_NLS_DEFAULT, which requires NLS support
to be enabled, otherwise the build fails with:

fs/isofs/inode.c: In function ‘isofs_show_options’:
fs/isofs/inode.c:518:44: error: ‘CONFIG_NLS_DEFAULT’ undeclared (first use in this function); did you mean ‘CONFIG_BLK_DEV’?
strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0)
^~~~~~~~~~~~~~~~~~
CONFIG_BLK_DEV

So, it's no longer the JOLIET support that needs NLS, but the whole
ISO9660 support.

Signed-off-by: Thomas Petazzoni <[email protected]>
---
fs/isofs/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/isofs/Kconfig b/fs/isofs/Kconfig
index 8ab9878..df03606 100644
--- a/fs/isofs/Kconfig
+++ b/fs/isofs/Kconfig
@@ -1,5 +1,6 @@
config ISO9660_FS
tristate "ISO 9660 CDROM file system support"
+ select NLS
help
This is the standard file system used on CD-ROMs. It was previously
known as "High Sierra File System" and is called "hsfs" on other
@@ -17,7 +18,6 @@ config ISO9660_FS
config JOLIET
bool "Microsoft Joliet CDROM extensions"
depends on ISO9660_FS
- select NLS
help
Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
which allows for long filenames in unicode format (unicode is the
--
2.9.4