Ensure that specified charset in iocharset= mount option is used. On error
correctly propagate error code back to the caller.
Signed-off-by: Pali Rohár <pali@xxxxxxxxxx>
---
fs/befs/linuxvfs.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 5c66550f7933..8d2954e3afd6 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -913,10 +913,9 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
befs_sb->mount_opts.iocharset);
befs_sb->nls = load_nls(befs_sb->mount_opts.iocharset);
if (!befs_sb->nls) {
- befs_warning(sb, "Cannot load nls %s"
- " loading default nls",
+ befs_error(sb, "Cannot load nls %s",
befs_sb->mount_opts.iocharset);
- befs_sb->nls = load_nls_default();
+ goto unacquire_priv_sbp;
}
/* load default nls if none is specified in mount options */
} else {
--
2.20.1
