From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756219AbbKDR5W (ORCPT ); Wed, 4 Nov 2015 12:57:22 -0500 Received: from mout.web.de ([212.227.15.4]:55520 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754063AbbKDR5T (ORCPT ); Wed, 4 Nov 2015 12:57:19 -0500 Subject: [PATCH] fs-ext4: Delete unnecessary checks before the function call "iput" 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> To: Andreas Dilger , "Theodore Ts'o" , linux-ext4@vger.kernel.org Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563A46F2.4050908@users.sourceforge.net> Date: Wed, 4 Nov 2015 18:57:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:J5Vuc2xzaZauQwGe15sZGAoaFuGmawDw51gz0N6j6gyK/LsASrA 2Ht++KD8i4aHEG+97SxoovV096MwImada18kD8dKNHtAL9Rif8OR9SgctlQp5O1dsj21sTQ B0ZEc4oYqkBh3HHECScSlStwGnCwjzuA9rPi+oS+0w0pl/GpF56xmfQYLYtCSKUO9fMPDjo 541j6NlXqE3gFeP4QTXMg== X-UI-Out-Filterresults: notjunk:1;V01:K0:tAQ1n9x/mYk=:DcJvH8Ql2rQpwd5lAP34wM /9rb5TahOtXUN4Kfb8smiLLwr5RoF9aokpL7yY5rDVXqJ1KDNaTYbrzpxq9ckXvWfi8e9uDoa OV2wCkVtRiMR4ZipWBs+C14Oo3vv1+rOEOnARHQ2t+CMTdebxIrnayxJVJQZ6t6hx9p5yNh0F kPnXGb569SCZyZ5QTH+wGXzTUzhzGsxxc/VU5do8Xeuuw9xsw3GiuaoM+iptj7ue3Gwkjph2E ekTgpz+WZVFHV8nk+rxhFwOkWn3mWIBD0jtlNu4a9/FF6Iesi/luewbP1zMSGBfFpWguL2ygv QBjHESakiO57iO0X6TPaJwreN5texY5gGQL1K7Q56jJ6J3uV9j0YHNLcqdgAEpBYzGRaxhoHP evTj0uLNt/Ax31JUZSUS/5JxPa4tYcuC7VVPj5zz+6Qo0MU92g/ts0nQzYHy4MnDb2e4LAMb9 lGtcn1d8J3oeXSQGpIeC5mjcYAOD2L4jJ4yvisPP4bOMfXcpYmyoiGzIEQMeICQhSLJ4UiKwO c6YJK8BftgJZo9ZF7W/gQ72TMWnO77okQlqTbohlkMsgjh252oELo/+GiNjoqg4SqBymgQXyA /zqOR1Px38x5Vlyhst2UVSvpY7tnvhuk9TFNfu3wtdelebvWWfatTP1Lf4BFz+Qjy/xz39c9B xJh7ih6SxPFe3BnV92FWuCrCFRaTv3YXp3sR1sAbkR89oBGSVCuzY3wvCWvM8+cIz63sXhkpm SfoIbUkCWxIuvWL6XSgI4y0NckLUBl4WZUwCxMpztW5hIulPF3MWKU2Q9SkH7X+wE2FCGvzru tjjjiLY Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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