Commit b3f25c2b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

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

From: Marek Szuba <scriptkiddie@wp.pl>

Use the configured default NLS rather than hardwire it.
parent 81567845
...@@ -802,7 +802,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) ...@@ -802,7 +802,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
#ifdef CONFIG_JOLIET #ifdef CONFIG_JOLIET
if (joliet_level && opt.utf8 == 0) { 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); sbi->s_nls_iocharset = load_nls(p);
if (! sbi->s_nls_iocharset) { if (! sbi->s_nls_iocharset) {
/* Fail only if explicit charset specified */ /* Fail only if explicit charset specified */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment