[PATCH] fs-ext4: Delete unnecessary checks before the function call "iput"
DORMANTno replies
From: SF Markus Elfring <hidden>
Date: 2015-11-04 17:57:22
Also in:
kernel-janitors, lkml
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
From: Markus Elfring <redacted> Date: Wed, 4 Nov 2015 18:48:38 +0100 The iput() 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 <redacted> --- fs/ext4/resize.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index ad62d7a..7918012 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c@@ -1942,10 +1942,10 @@ retry: err = ext4_convert_meta_bg(sb, resize_inode); if (err) goto out; - if (resize_inode) { - iput(resize_inode); - resize_inode = NULL; - } + + iput(resize_inode); + resize_inode = NULL; + if (n_blocks_count_retry) { n_blocks_count = n_blocks_count_retry; n_blocks_count_retry = 0;
@@ -2011,8 +2011,7 @@ retry: out: if (flex_gd) free_flex_gd(flex_gd); - if (resize_inode != NULL) - iput(resize_inode); + iput(resize_inode); ext4_msg(sb, KERN_INFO, "resized filesystem to %llu", n_blocks_count); return err; }
--
2.6.2