Commit 12a88695 authored by Vegard Wærp's avatar Vegard Wærp Committed by Linus Torvalds

[PATCH] BeFS: load default nls if none is specified in mount options

Makes the BeOS File Systen driver load the default nls if none is specified
in the "iocharset" mount option.
Signed-off-by: default avatarVegard Wærp <vegarwa@online.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 44a4ce89
...@@ -857,10 +857,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -857,10 +857,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
befs_sb->nls = load_nls(befs_sb->mount_opts.iocharset); befs_sb->nls = load_nls(befs_sb->mount_opts.iocharset);
if (!befs_sb->nls) { if (!befs_sb->nls) {
befs_warning(sb, "Cannot load nls %s" befs_warning(sb, "Cannot load nls %s"
"loding default nls", " loading default nls",
befs_sb->mount_opts.iocharset); befs_sb->mount_opts.iocharset);
befs_sb->nls = load_nls_default(); befs_sb->nls = load_nls_default();
} }
/* load default nls if none is specified in mount options */
} else {
befs_debug(sb, "Loading default nls");
befs_sb->nls = load_nls_default();
} }
return 0; return 0;
......
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