fat: Cleanup nls_unload() usage
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Mon, 15 Mar 2010 20:48:09 +0000 (05:48 +0900)
committerOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Mon, 15 Mar 2010 20:49:05 +0000 (05:49 +0900)
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>
fs/fat/inode.c

index 0ce143b..c611818 100644 (file)
@@ -1497,10 +1497,8 @@ out_fail:
                iput(fat_inode);
        if (root_inode)
                iput(root_inode);
                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;
        if (sbi->options.iocharset != fat_default_iocharset)
                kfree(sbi->options.iocharset);
        sb->s_fs_info = NULL;