From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752417AbbFZPdi (ORCPT ); Fri, 26 Jun 2015 11:33:38 -0400 Received: from mout.web.de ([212.227.17.11]:55668 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752094AbbFZPda (ORCPT ); Fri, 26 Jun 2015 11:33:30 -0400 Message-ID: <558D70C2.4080406@users.sourceforge.net> Date: Fri, 26 Jun 2015 17:33:22 +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: Changman Lee , Jaegeuk Kim , linux-f2fs-devel@lists.sourceforge.net CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] f2fs crypto: Delete an unnecessary check before the function call "key_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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Z10paxcUkjJHa+n0S2OOPEZr9n6YXOVljhw8537tQg98fPpO9X8 30e8eRuqfrgaApO/8VKKKXodwoYb2PXAvJ/7PpekZnAAwTtn/HIkG49yEswmZHreJZ1aMtz JSyDcRs0egSCqcqK/MxQtPp5k1H2MVYB2jfkoKqwR6vuWxjDTDe2hQO3QTyO+JJPWLzF0hC jjPKutRDviLpr7TM7RTqA== X-UI-Out-Filterresults: notjunk:1;V01:K0:hgwkNfYaAd0=:Vnd2WZsFaRu71TDXzbfGDy fiuf2FYGPuaBomYujNsRRR3SxJBtpr02VRIWD44rWk+hBHJuqyIeOTH66+3E3kpPpgLyPIGzX f59h/PTgLVzpNts7Wv3qHhc7lQ2ZjfNKsEjyX2zh2kEWD3RXwBNGwzfY+D/mcPEGXFVl6jQfs 7KoHAr0TYf6BD4M6avIybA3B/y6VWUQuE2nY4I3i/9iI3adbB4da6+QqqjuiEhS9MZ6ADUeGY Mmle1+idd+BaJ1tgXFIjQfdrw9ej0RlZctt+iMsIZQluWakJG6AnxDMgonkIohgbIr4DtJjsb vFH73P1bcGjK5A3i4TXUJZVM7o7QNikyvug1ttbU4O4X8Qvi6NXlZvsC4shqIP+e2cfoefbul L+lDIs976Mm/TBHWgg2gmSZ6IFCkJcSJr2IOV2RcuLmTFW8A7cUshlrEF1ox63xGNTiKXEpT5 baNdCSS9p/kgv9PbzRGEGttFQZwKZoZWweCxIB+2qQ8HDfM2oJEIANy7Qs2jqY5E1sbnF+kP3 6YE/m6SxJ+SRH0JRUlMJPaJSZF4+BoCK+rlJEdRRbicnu2DOwzpGodSHzy/JstJJWq+fXQ0/T 1L1quUroqaM9iwWfVUxubDHbcwCcsBMze7OHYaNBPp8SXqwxUIagnZAozSDjE2Ck9OsA/zmOa UALhspvBP1MKpO52/54dZFaeFQSMVuE6n5ZM5qNFNBZyYT1N8eJ9Zzu+/8w8dkqKXj7w= 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 17:28:55 +0200 The key_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/f2fs/crypto_key.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/f2fs/crypto_key.c b/fs/f2fs/crypto_key.c index 95b8f93..9f77de2 100644 --- a/fs/f2fs/crypto_key.c +++ b/fs/f2fs/crypto_key.c @@ -92,8 +92,7 @@ static void f2fs_free_crypt_info(struct f2fs_crypt_info *ci) if (!ci) return; - if (ci->ci_keyring_key) - key_put(ci->ci_keyring_key); + key_put(ci->ci_keyring_key); crypto_free_ablkcipher(ci->ci_ctfm); kmem_cache_free(f2fs_crypt_info_cachep, ci); } -- 2.4.4