From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Mon, 15 Mar 2010 20:48:09 +0000 (+0900)
Subject: fat: Cleanup nls_unload() usage
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1bdb6f9199def1c3538c18089e499f5df5ff1747;p=linux-beck.git

fat: Cleanup nls_unload() usage

Other users doesn't check NULL explicitly. So, these doesn't also
check to remove inconsistency.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
---

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 0ce143bd7d56..c611818893b2 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1497,10 +1497,8 @@ out_fail:
 		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;