From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546AbbFZNZj (ORCPT ); Fri, 26 Jun 2015 09:25:39 -0400 Received: from mout.web.de ([212.227.15.14]:64752 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043AbbFZNZ3 (ORCPT ); Fri, 26 Jun 2015 09:25:29 -0400 Message-ID: <558D52C0.7080109@users.sourceforge.net> Date: Fri, 26 Jun 2015 15:25:20 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Joel Becker , kernel-janitors@vger.kernel.org CC: LKML , Julia Lawall Subject: [PATCH] configfs: Delete unnecessary checks before the function call "config_item_put" 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> <546A419B.7060409@users.sourceforge.net> In-Reply-To: <546A419B.7060409@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:o3MVg/NAPBhe+o756TrLoFEVysbAAmUxp33IUpV1WooBkuKw2Vs qwKT5yoEbdcDXgsO0ocLkcbsV/85l7BlTs6Om/ZtNAWpavEQxWVZliasT/5XXtbKkReQIGy hi7rAMtEo9K9IaNzOZQvRvoNbhrv9wQ+HxUtZKuY2lQ+0aJ2Hh5pxF06rXBUCCggc9euYyQ BDWk9dN9x21XgbpUa4NkA== X-UI-Out-Filterresults: notjunk:1;V01:K0:rOZjOcJgba4=:uwegGeaVU3qy++bHwWTYuz m+IBeZta7QrnC/zXRmdN0/5bYx1YDfhcPIygC1GDSnNDlzUvbSQ5earjFPe5Evis0AesFePUX k4qElkjT53+vFO6VLrD94J+wxFVvR4Ad+rnTcPXjqtcLkSLP+WplCWuXMjNfE37zo5Tlzw1Yw H7sXauU+tbIxhvOA/KYdotjl3yNgFNxdRfdMX0yxlR0l0tV0EJsOkA6wqEReodoNB3dH6oCfZ CvAUbuYmS7UuVslsBQ07sWqej1I15Jelip3P8jZ+neaU4mLO7RqEhoUsf2FFZzSR23mi4dr3e yotojTKjH3A6oGqzJinYbpfrfW2heP7315wrbkc2lQ20OA7paW6CFqKKjn3OFxJOdhl1AuhSb LXQgUSXyLgxuFAPitdaw26sniu78rKJBxSTuTjLLCitojGjrgZ4FAlKPySdc/fzet2d2kXhbs eUdJUu3IILOBsv1BTwyRUF9fSjrfMUDMLUOy7+34pj43gl8AxV/Zb+ppVe3LugZ1+DbftKN2f Pe6CgvEUaFEs8SjyP4q74gVnA6UHxCEV7DJvn756d81iv32ghPP2bXrrNesEf3iECLUmUAtkW Mu5Bxmd2HNwKHv16lLI1q5+3prA6J+cd/2RUy7v2YHB6Ghr4OqXbRFGbbdeW7CGm80XZqxzlI sTa6JLWfmlq+5iJr2/UC5W2CD6mqvIOtbabplVI7gfWT8twbxsvlonpJQsPmxNxPwvoo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 26 Jun 2015 15:20:43 +0200 The config_item_put() 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/configfs/file.c | 5 ++--- fs/configfs/item.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 403269f..c70997f 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c @@ -274,7 +274,7 @@ static int check_perm(struct inode * inode, struct file * file) Enomem: module_put(attr->ca_owner); Done: - if (error && item) + if (error) config_item_put(item); return error; } @@ -291,8 +291,7 @@ static int configfs_release(struct inode * inode, struct file * filp) struct module * owner = attr->ca_owner; struct configfs_buffer * buffer = filp->private_data; - if (item) - config_item_put(item); + config_item_put(item); /* After this point, attr should not be accessed. */ module_put(owner); diff --git a/fs/configfs/item.c b/fs/configfs/item.c index 4d6a30e..6173fa7 100644 --- a/fs/configfs/item.c +++ b/fs/configfs/item.c @@ -152,8 +152,7 @@ static void config_item_cleanup(struct config_item *item) t->ct_item_ops->release(item); if (s) config_group_put(s); - if (parent) - config_item_put(parent); + config_item_put(parent); } static void config_item_release(struct kref *kref) -- 2.4.4