From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965265AbbBBWc4 (ORCPT ); Mon, 2 Feb 2015 17:32:56 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:39896 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754913AbbBBWcy (ORCPT ); Mon, 2 Feb 2015 17:32:54 -0500 Message-ID: <54CFFB03.6010805@oracle.com> Date: Mon, 02 Feb 2015 16:32:35 -0600 From: Dave Kleikamp User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: SF Markus Elfring , Dave Kleikamp , jfs-discussion@lists.sourceforge.net CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH] jfs: Deletion of an unnecessary check before the function call "unload_nls" 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> <54CE511C.3060908@users.sourceforge.net> In-Reply-To: <54CE511C.3060908@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/01/2015 10:15 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sun, 1 Feb 2015 17:00:24 +0100 > > The unload_nls() 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 Thanks! I'll push this upstream. Dave > --- > fs/jfs/super.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/jfs/super.c b/fs/jfs/super.c > index 16c3a95..5d30c56 100644 > --- a/fs/jfs/super.c > +++ b/fs/jfs/super.c > @@ -619,8 +619,7 @@ out_mount_failed: > iput(sbi->direct_inode); > sbi->direct_inode = NULL; > out_unload: > - if (sbi->nls_tab) > - unload_nls(sbi->nls_tab); > + unload_nls(sbi->nls_tab); > out_kfree: > kfree(sbi); > return ret; >