From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756390AbbKDTK7 (ORCPT ); Wed, 4 Nov 2015 14:10:59 -0500 Received: from mout.web.de ([212.227.15.4]:63417 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755119AbbKDTK5 (ORCPT ); Wed, 4 Nov 2015 14:10:57 -0500 Subject: [PATCH] UBIFS: 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: Adrian Hunter , Artem Bityutskiy , linux-mtd@lists.infradead.org Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563A581B.7070708@users.sourceforge.net> Date: Wed, 4 Nov 2015 20:10:19 +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:UWDu5HFrkHuuCs72ToKb5XJfVQZ0xmB1JPTs/hDohYYEmFxsq0k bP3OKHBa3wMhcZ29Q4s/QAJHU/UfALKff9TRaCzFpPKKjX57u3FkRCSGikcEpJkgQroy4qf BJXgQw0kx88CwErkHpcdUdBexCyePXJkYk1f+2hs6eLbOqLhWKOyb44kGEyeo/BwTCIkj6M 3yMEJGE0thQJJPaWM6wJw== X-UI-Out-Filterresults: notjunk:1;V01:K0:ykW+jtx/uqM=:pEwsIeSuILOyEQ30xh6ivB bMQYRcTf8seIvk4gE9C3pspOElOS88vWoPq9d6CcqGaQi4KvTJ3MOuDMi7gBP/sBjUqnInhMh 3Jw5+cMhEYHZIP+SyT+SGQYZd1sdQ3QuYB1T4K5rx4RB+Zp7zqKpq+oDn5hM8qM0NxusXeMJ7 +ii8SgbhukibZjs8ajBOaCd6iKhrcMayRMSXp/1RUykN8RxYFsmE7BPrGJbWntx/i3HrdFq6x +IExZLCjLXx0rhYGxClufjI2BFXPGviKx/jVNRAEQv+A7WMBkIsbczqdgQ63/MEnPzub4Itvv TtwV48LWXcO8qTrVLx6v/qK/JlX2zDJFvysUH4IexkxyAmr8kh7F8e41Kyf1ktC+x/M3Edcmn Wo3YqXdXPcxcsunX0XrzaKqYY98joxejkXa7urwrp1QRzBw8paWq/yBr0dNe0esbKVhd5eWZl +OZvPJtn660vwqMLsr7Y7XpL99wk/s2JXbt/t303GcnUVkmKpNxhGGDY2F5mKj+nZIYOdw85i HPgEmvYNuOh58c3Kt3cYjMUcR3+64uRXW13WQE3UpjDzdNHp/PsI6CLgFsUypiuIaX1YXEtVj gayXIm4hCGyBmccKVFJTGs5fA69ypLVnMTR58Sy7T3kx+qWpfTQpN2E7kPSnez2Sapjjrmk0S gvR0wN0octNsqgT26WvVpP6TATINntc9Bcvdgrf0cxBXLKwawk8FAmwgxUlWJvMKzp3Dw1jc4 iAOUIUU4HJOToboVuL+M7T7L/2EHmia4pALNEjuYQ15FsOJzV057piGzZTe1rTVTRKaugLKJ5 FnqGBzn 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 20:00:42 +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/ubifs/recovery.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 2a1f0bc..586d593 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -1331,8 +1331,7 @@ void ubifs_destroy_size_tree(struct ubifs_info *c) struct size_entry *e, *n; rbtree_postorder_for_each_entry_safe(e, n, &c->size_tree, rb) { - if (e->inode) - iput(e->inode); + iput(e->inode); kfree(e); } @@ -1533,8 +1532,7 @@ int ubifs_recover_size(struct ubifs_info *c) err = fix_size_in_place(c, e); if (err) return err; - if (e->inode) - iput(e->inode); + iput(e->inode); } } -- 2.6.2