From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 1 Feb 2015 16:00:24 +0000 (+0100)
Subject: jfs: Deletion of an unnecessary check before the function call "unload_nls"
X-Git-Tag: v4.0-rc1~104^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=648695c74811f09a8ad80d7c3be72b8169589a64;p=thirdparty%2Fkernel%2Flinux.git

jfs: Deletion of an unnecessary check before the function call "unload_nls"

The unload_nls() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
---

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 16c3a9556634d..5d30c56ae0750 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -619,8 +619,7 @@ out_mount_failed:
 	iput(sbi->direct_inode);
 	sbi->direct_inode = NULL;
 out_unload:
-	if (sbi->nls_tab)
-		unload_nls(sbi->nls_tab);
+	unload_nls(sbi->nls_tab);
 out_kfree:
 	kfree(sbi);
 	return ret;