[PATCH] isofs "default NLS charset not used" fix

From: Marek Szuba <scriptkiddie@wp.pl>

Use the configured default NLS rather than hardwire it.

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 7fd9a89aaa1411088d1c5e921b4993b345f1f8b9..884719be0539e38e78076b5bbe3268db3ba4aefd 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -802,7 +802,7 @@ root_found:
 
 #ifdef CONFIG_JOLIET
        if (joliet_level && opt.utf8 == 0) {
-               char * p = opt.iocharset ? opt.iocharset : "iso8859-1";
+               char * p = opt.iocharset ? opt.iocharset : CONFIG_NLS_DEFAULT;
                sbi->s_nls_iocharset = load_nls(p);
                if (! sbi->s_nls_iocharset) {
                        /* Fail only if explicit charset specified */