From patchwork Sat Jul 4 09:26:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 6718321 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 08D389F2F0 for ; Sun, 5 Jul 2015 11:27:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E73F20612 for ; Sun, 5 Jul 2015 11:27:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5ED3220648 for ; Sun, 5 Jul 2015 11:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754953AbbGEL0x (ORCPT ); Sun, 5 Jul 2015 07:26:53 -0400 Received: from mout.web.de ([212.227.17.12]:49705 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463AbbGEL0v (ORCPT ); Sun, 5 Jul 2015 07:26:51 -0400 Received: from [192.168.1.2] ([77.181.177.122]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MZlZK-1ZTXKg1WWM-00LXBL; Sat, 04 Jul 2015 11:26:56 +0200 Message-ID: <5597A6DE.8040803@users.sourceforge.net> Date: Sat, 04 Jul 2015 11:26:54 +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: Alexander Viro , linux-fsdevel@vger.kernel.org CC: Linux Kernel Mailing List , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] fs-namespace: Delete unnecessary checks before the function call "mntput" 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> <546B2B8A.4090809@users.sourceforge.net> In-Reply-To: <546B2B8A.4090809@users.sourceforge.net> X-Provags-ID: V03:K0:qrFzP8D2b1AzC6Bzd5DwTZJYpLkcoLBkanDWm5tKN++s9DwA0UN B3gPkwcxQAxgeRQWP4OjNDECu91G/Xp+QGqIPGC8dHb4rZqeo8WuFn0IgAlvvs0RusLO3G8 48d/UueZq78kxR2IMHYU0edjMPtD5jVZ0AJwnV84L5H3P0hPTXskir9NCbCiSYxy9X9LPyc RzS+NRVmY2sRFLswzBByA== X-UI-Out-Filterresults: notjunk:1; V01:K0:EnzR4/iHVE0=:Lwn0ZUxkmvO9T1syRw5OuF uVZS2P9u6wri7JCwm/Q8XjFfGL5qMVUiqvT8RcMqWI09fz0G21gVIaKOPJhkp7TgRtJmyATXd 4qVmC8eIgCs0Baa2SPdYFG3UY4y7jVkCtRbMnanOxCP/IojAqJvIxyVsUf70XBitZg0sPK9UO p8nymlaMjGj70MWdZt8kUSiFFWTXKxPYeARNkDrNl9Cmf9bBIjU0dJlP4m+rwfjl5fZ7PkmUH s9VNnx2bMsgmAkRz2afkX4u2abzps0Mj3ZBpRDfuKgOuBLewA6fgk9J8lIlVhDfymWjNLZ3Xk BZyjl13XGjPv1RpCukU2y28jK5VwwXV51Meg6FpcrDGbYTpI/iASVD3LB2nyEZRKjnf4BGJ9Z kwweSLtNjuHLW4AN9GcTDBtBKVfePYKMIWfKTWQhkgO6CBMx66xfZMSd00mQU1v5KxSVl+/YG MkSpbCwHOzlt/rRwQpwKNU92SCKxcfjLLgED7AhkS6dvNssXUCfQuu2IyNp17M+E9e3RlcSdn WFl6789MsrX7CPE9UMnM27PbITpsuJksbHfYOIDJSSPYC9Zsvmnk/HCmPBFY0m7ZSYX4BclcU /SQbFmkHPp8OJF1fjcmVFzxwfOAAMdVAAAvhebRzN18CyA6ff2S9WT5PaJ4IQSp+P6qban8DH OU0YaEP26/mbbaGrh6Z0U2wCZRltIZoIIzR4TXOOBerratUb512kzwtJRafAkG91VGc8= Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 4 Jul 2015 11:21:17 +0200 The mntput() 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/namespace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index e0b2f36..bc689bd 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2809,12 +2809,8 @@ struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns, p = next_mnt(p, old); } namespace_unlock(); - - if (rootmnt) - mntput(rootmnt); - if (pwdmnt) - mntput(pwdmnt); - + mntput(rootmnt); + mntput(pwdmnt); return new_ns; }