patch-2.3.34 linux/fs/fat/inode.c

• Lines: 27
• Date: Mon Dec 20 14:41:47 1999
• Orig file: v2.3.33/linux/fs/fat/inode.c
• Orig date: Sun Nov 7 16:37:34 1999

diff -u --recursive --new-file v2.3.33/linux/fs/fat/inode.c linux/fs/fat/inode.c
@@ -653,13 +653,13 @@
 	if (sbi->options.isvfat && !opts.utf8) {
 		p = opts.iocharset ? opts.iocharset : "iso8859-1";
 		sbi->nls_io = load_nls(p);
-		if (! sbi->nls_io) {
+		if (! sbi->nls_io)
 			/* Fail only if explicit charset specified */
 			if (opts.iocharset)
 				goto out_unload_nls;
-			sbi->nls_io = load_nls_default();
-		}
 	}
+	if (! sbi->nls_io)
+		sbi->nls_io = load_nls_default();
 
 	root_inode=get_empty_inode();
 	if (!root_inode)
@@ -681,8 +681,7 @@
 out_no_root:
 	printk("get root inode failed\n");
 	iput(root_inode);
-	if (sbi->nls_io)
-		unload_nls(sbi->nls_io);
+	unload_nls(sbi->nls_io);
 out_unload_nls:
 	unload_nls(sbi->nls_disk);
 	goto out_fail;