From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033426AbbKERA4 (ORCPT ); Thu, 5 Nov 2015 12:00:56 -0500 Received: from mout.web.de ([212.227.15.4]:52795 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030726AbbKERAy (ORCPT ); Thu, 5 Nov 2015 12:00:54 -0500 Subject: [PATCH] IPC-mqueue: Delete unnecessary checks before two function calls To: linux-kernel@vger.kernel.org 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> Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563B8B3E.8050004@users.sourceforge.net> Date: Thu, 5 Nov 2015 18:00:46 +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=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:P2KqHUMw+hZHkpcjEBEM9Lv9gjIU1NkXP3q2RMieNlfRI1DLoHY Ocnbkx0HdSiB9F3pQnvAbLcWsEgDU1HAIQ1GksNHswUJMiYLqKpWW9GtSD+TrBCpWBBVaCN 3qxu0hI5t3WUUxEte0kqXy6yyr9frMF78fnfxtosC3jAk0Cm+JIx2R5tVVM47H1bfua3Z/O MVOv3escepMFHelvtepOA== X-UI-Out-Filterresults: notjunk:1;V01:K0:WJ+si9bYdjg=:nFAldK8QKrkHU4+9lgFche 72l6CvNZdaOF4EUWDDX6RBnvKeKgFAnD0vmFQh04r9AAuhlHqOlEkKlno25B+JmPPbqO1lI1y fFIPxKSMwHKLNYgfNqgMWSx/ZedWsFgA4aS5CgHPmtcZa8MN45n82DUPHrYZY/sNtL4bwzbqp Oo03lHNjqMIMEtH1d5yfyj44yW7yesHUa66/ZcYsxkKhBpaiv0j6OGsLTbp84oS0iUBKfC7Ao rTmd5+8TJPIi55zTn98igT/z3kxRaFShcBhyIJhKy+PJuyGwbvHVjT8JxYh1VfAf/CTj0XrHg MC2UJxqGEoVeTA19jaSXLYmFmNyP4746jEatAbNMgeAfAcMMTHPCe8NRyZZwPOv8x09KJv+ui 9zzpPH8Op8svSamqUYhSbsclb7W0IWM/Pxc3plZhJmKkJVq/cmlcdzc3C4SLIS92IChh6YXjM lV/GrEIBQ5e7p9ry93kfcxbc03AuCHIWzPhO3sSiMbhpLRnJUi8RPhf798H2PvQOaFhE/YKCQ VQYG6qCQ3hV1Qzu/vimkYzQURi4eTvqvhRP8Z2MYbgkWXuXYOenwtSOUxfybLQ1QdvBxnEcXA o5ju/H2bmcNRQzlWJaDeBMKLxW0+1aKpG4t4I1Iu2VZHwPU61DrIKwAA+q9gtuyKDOGtLYKuT VZjfdpMcxseiVn/OiLDk+VsXhz1W8r6hTzvSRWohTrSAzzteYte84DfPVak6XjnI7LZHWQ8WQ 2YX2t/EkAaJPgITJcEq+XxMAcMEKD9Gm/CpaFQp/ZhDqCrSyOPral82pGPLsaQI3VFTH1vY4r /lVNwOw Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 5 Nov 2015 17:55:25 +0100 The functions iput() and unregister_sysctl_table() test whether their argument is NULL and then return immediately. Thus the tests around their calls are not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- ipc/mqueue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 161a180..ade9dd8 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -885,8 +885,7 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name) out_unlock: mutex_unlock(&d_inode(mnt->mnt_root)->i_mutex); - if (inode) - iput(inode); + iput(inode); mnt_drop_write(mnt); out_name: putname(name); @@ -1460,8 +1459,7 @@ static int __init init_mqueue_fs(void) out_filesystem: unregister_filesystem(&mqueue_fs_type); out_sysctl: - if (mq_sysctl_table) - unregister_sysctl_table(mq_sysctl_table); + unregister_sysctl_table(mq_sysctl_table); kmem_cache_destroy(mqueue_inode_cachep); return error; } -- 2.6.2