From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH] fs-ext4: Delete unnecessary checks before the function call "iput" Date: Wed, 4 Nov 2015 18:57:06 +0100 Message-ID: <563A46F2.4050908@users.sourceforge.net> References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall To: Andreas Dilger , Theodore Ts'o , linux-ext4@vger.kernel.org Return-path: In-Reply-To: <5317A59D.4@users.sourceforge.net> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org From: Markus Elfring 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 --- 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