[PATCH -next] fatfs: remove redundant judgment

fengyubo posted 1 patch 4 years, 2 months ago
fs/fat/inode.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
[PATCH -next] fatfs: remove redundant judgment
Posted by fengyubo 4 years, 2 months ago
From: Yubo Feng <fengyubo3@huawei.com>

iput() has already judged the incoming parameter, so there is no need to
repeat outside.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yubo Feng <fengyubo3@huawei.com>
---
 fs/fat/inode.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index a6f1c6d426d1..da8619148590 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1888,10 +1888,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
 		fat_msg(sb, KERN_INFO, "Can't find a valid FAT filesystem");
 
 out_fail:
-	if (fsinfo_inode)
-		iput(fsinfo_inode);
-	if (fat_inode)
-		iput(fat_inode);
+	iput(fsinfo_inode);
+	iput(fat_inode);
 	unload_nls(sbi->nls_io);
 	unload_nls(sbi->nls_disk);
 	fat_reset_iocharset(&sbi->options);
-- 
2.17.1
Re: [PATCH -next] fatfs: remove redundant judgment
Posted by OGAWA Hirofumi 4 years, 2 months ago
fengyubo <fengyubo3@huawei.com> writes:

> From: Yubo Feng <fengyubo3@huawei.com>
>
> iput() has already judged the incoming parameter, so there is no need to
> repeat outside.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yubo Feng <fengyubo3@huawei.com>

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

Thanks.

> ---
>  fs/fat/inode.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/fat/inode.c b/fs/fat/inode.c
> index a6f1c6d426d1..da8619148590 100644
> --- a/fs/fat/inode.c
> +++ b/fs/fat/inode.c
> @@ -1888,10 +1888,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
>  		fat_msg(sb, KERN_INFO, "Can't find a valid FAT filesystem");
>  
>  out_fail:
> -	if (fsinfo_inode)
> -		iput(fsinfo_inode);
> -	if (fat_inode)
> -		iput(fat_inode);
> +	iput(fsinfo_inode);
> +	iput(fat_inode);
>  	unload_nls(sbi->nls_io);
>  	unload_nls(sbi->nls_disk);
>  	fat_reset_iocharset(&sbi->options);

-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>