---

yaml --- r: 198107 b: refs/heads/master c: 1bdb6f9 h: refs/heads/master i: 198105: 1bc4262 198103: d04d126 v: v3
git-mirror · Mar 15, 2010 · c5d9cdd · c5d9cdd
1 parent 4521809
commit c5d9cdd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ed3dec1568d1232fcfb2aa8c5f9e3f38940c9d8
+refs/heads/master: 1bdb6f9199def1c3538c18089e499f5df5ff1747
diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c
@@ -1497,10 +1497,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
 		iput(fat_inode);
 	if (root_inode)
 		iput(root_inode);
-	if (sbi->nls_io)
-		unload_nls(sbi->nls_io);
-	if (sbi->nls_disk)
-		unload_nls(sbi->nls_disk);
+	unload_nls(sbi->nls_io);
+	unload_nls(sbi->nls_disk);
 	if (sbi->options.iocharset != fat_default_iocharset)
 		kfree(sbi->options.iocharset);
 	sb->s_fs_info = NULL;