2015-02-01 16:15:40

by SF Markus Elfring

Subject: [PATCH] jfs: Deletion of an unnecessary check before the function call "unload_nls"

From: Markus Elfring <[email protected]>
Date: Sun, 1 Feb 2015 17:00:24 +0100

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 <[email protected]>
---
fs/jfs/super.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 16c3a95..5d30c56 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;
--
2.2.2

2015-02-02 22:32:56

by Dave Kleikamp

Subject: Re: [PATCH] jfs: Deletion of an unnecessary check before the function call "unload_nls"

On 02/01/2015 10:15 AM, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Sun, 1 Feb 2015 17:00:24 +0100
>
> 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 <[email protected]>

Thanks! I'll push this upstream.

Dave

> ---
> fs/jfs/super.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/jfs/super.c b/fs/jfs/super.c
> index 16c3a95..5d30c56 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;
>