|
@@ -572,7 +572,6 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
|
|
case Opt_utf8:
|
|
case Opt_utf8:
|
|
uopt->flags |= (1 << UDF_FLAG_UTF8);
|
|
uopt->flags |= (1 << UDF_FLAG_UTF8);
|
|
break;
|
|
break;
|
|
-#ifdef CONFIG_UDF_NLS
|
|
|
|
case Opt_iocharset:
|
|
case Opt_iocharset:
|
|
if (!remount) {
|
|
if (!remount) {
|
|
if (uopt->nls_map)
|
|
if (uopt->nls_map)
|
|
@@ -581,7 +580,6 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
|
|
uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
|
|
uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
-#endif
|
|
|
|
case Opt_uforget:
|
|
case Opt_uforget:
|
|
uopt->flags |= (1 << UDF_FLAG_UID_FORGET);
|
|
uopt->flags |= (1 << UDF_FLAG_UID_FORGET);
|
|
break;
|
|
break;
|
|
@@ -2117,7 +2115,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
|
|
udf_err(sb, "utf8 cannot be combined with iocharset\n");
|
|
udf_err(sb, "utf8 cannot be combined with iocharset\n");
|
|
goto parse_options_failure;
|
|
goto parse_options_failure;
|
|
}
|
|
}
|
|
-#ifdef CONFIG_UDF_NLS
|
|
|
|
if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map) {
|
|
if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map) {
|
|
uopt.nls_map = load_nls_default();
|
|
uopt.nls_map = load_nls_default();
|
|
if (!uopt.nls_map)
|
|
if (!uopt.nls_map)
|
|
@@ -2125,7 +2122,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
|
|
else
|
|
else
|
|
udf_debug("Using default NLS map\n");
|
|
udf_debug("Using default NLS map\n");
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
if (!(uopt.flags & (1 << UDF_FLAG_NLS_MAP)))
|
|
if (!(uopt.flags & (1 << UDF_FLAG_NLS_MAP)))
|
|
uopt.flags |= (1 << UDF_FLAG_UTF8);
|
|
uopt.flags |= (1 << UDF_FLAG_UTF8);
|
|
|
|
|
|
@@ -2279,10 +2275,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
|
|
error_out:
|
|
error_out:
|
|
iput(sbi->s_vat_inode);
|
|
iput(sbi->s_vat_inode);
|
|
parse_options_failure:
|
|
parse_options_failure:
|
|
-#ifdef CONFIG_UDF_NLS
|
|
|
|
if (uopt.nls_map)
|
|
if (uopt.nls_map)
|
|
unload_nls(uopt.nls_map);
|
|
unload_nls(uopt.nls_map);
|
|
-#endif
|
|
|
|
if (lvid_open)
|
|
if (lvid_open)
|
|
udf_close_lvid(sb);
|
|
udf_close_lvid(sb);
|
|
brelse(sbi->s_lvid_bh);
|
|
brelse(sbi->s_lvid_bh);
|
|
@@ -2332,10 +2326,8 @@ static void udf_put_super(struct super_block *sb)
|
|
sbi = UDF_SB(sb);
|
|
sbi = UDF_SB(sb);
|
|
|
|
|
|
iput(sbi->s_vat_inode);
|
|
iput(sbi->s_vat_inode);
|
|
-#ifdef CONFIG_UDF_NLS
|
|
|
|
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
|
|
if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
|
|
unload_nls(sbi->s_nls_map);
|
|
unload_nls(sbi->s_nls_map);
|
|
-#endif
|
|
|
|
if (!sb_rdonly(sb))
|
|
if (!sb_rdonly(sb))
|
|
udf_close_lvid(sb);
|
|
udf_close_lvid(sb);
|
|
brelse(sbi->s_lvid_bh);
|
|
brelse(sbi->s_lvid_bh);
|