git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
udf
/
super.c
diff --git
a/fs/udf/super.c
b/fs/udf/super.c
index
bbad849
..
54e1ecf
100644
(file)
--- a/
fs/udf/super.c
+++ b/
fs/udf/super.c
@@
-417,7
+417,7
@@
udf_parse_options(char *options, struct udf_options *uopt)
case Opt_utf8:
uopt->flags |= (1 << UDF_FLAG_UTF8);
break;
case Opt_utf8:
uopt->flags |= (1 << UDF_FLAG_UTF8);
break;
-#if
defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+#if
def CONFIG_UDF_NLS
case Opt_iocharset:
uopt->nls_map = load_nls(args[0].from);
uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
case Opt_iocharset:
uopt->nls_map = load_nls(args[0].from);
uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
@@
-1518,7
+1518,7
@@
static int udf_fill_super(struct super_block *sb, void *options, int silent)
"utf8 cannot be combined with iocharset\n");
goto error_out;
}
"utf8 cannot be combined with iocharset\n");
goto error_out;
}
-#if
defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+#if
def CONFIG_UDF_NLS
if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
{
uopt.nls_map = load_nls_default();
if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
{
uopt.nls_map = load_nls_default();
@@
-1668,7
+1668,7
@@
error_out:
udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
}
}
udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
}
}
-#if
defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+#if
def CONFIG_UDF_NLS
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(UDF_SB(sb)->s_nls_map);
#endif
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(UDF_SB(sb)->s_nls_map);
#endif
@@
-1746,7
+1746,7
@@
udf_put_super(struct super_block *sb)
udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
}
}
udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
}
}
-#if
defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+#if
def CONFIG_UDF_NLS
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(UDF_SB(sb)->s_nls_map);
#endif
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
unload_nls(UDF_SB(sb)->s_nls_map);
#endif