From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH] fs-namespace: Delete unnecessary checks before the function call "mntput" Date: Sat, 04 Jul 2015 11:26:54 +0200 Message-ID: <5597A6DE.8040803@users.sourceforge.net> 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.so urceforge.net> <546B2B8A.4090809@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: Linux Kernel Mailing List , kernel-janitors@vger.kernel.org, Julia Lawall To: Alexander Viro , linux-fsdevel@vger.kernel.org Return-path: In-Reply-To: <546B2B8A.4090809@users.sourceforge.net> Sender: kernel-janitors-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org 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; } -- 2.4.5