From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752132AbbFZOQ1 (ORCPT ); Fri, 26 Jun 2015 10:16:27 -0400 Received: from mout.web.de ([212.227.15.3]:51661 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751849AbbFZOQY (ORCPT ); Fri, 26 Jun 2015 10:16:24 -0400 Message-ID: <558D5EB4.30803@users.sourceforge.net> Date: Fri, 26 Jun 2015 16:16:20 +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: Andreas Dilger , "Theodore Ts'o" , linux-ext4@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] keys: 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:HWS7MhSy+E+QUE9MB3oi5CLiemHnZx/4O1/DopMaKrIxjt3PdEz bsQuslX4gTn3hhoYHxafn+RwRUwX/8yuH1+MllRrAUdVebrHbc3zN4SkIYslNIIuBpv8j4b JoGNplzyR5RoUkt2CzPzs13W2RUd+XpDE5EQU0Ot44rSfV7bROz+h8wN4RA0vaQrkQAXjsF Urv9fjrP54vvrLufveNhQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:vWuy6YXlgRA=:XZw/DuYx4qDbCwqW7VvLp2 UC12lvQ1DnWwcTILgTA5IYnTB5J2D+Wy1sqYmdKHaoFF/WmB2jW95uVyJmt4BcnBSeMRhLvI8 L9XrsR/1vE7JkSCeEtXpQ5AazlJM+rK/s0fN5XVyumVZViue/gAG53sytJu592P/ukVyafyrT OQPO2F+2cNVW7qHivSmxSNQ3AhwWE7taNY0DXd7bZjjvonWAxNcbGWPkVEq3Ha8yduLOd6q9S xHTKY8Y1QgOxmvHkGjaPj8lZi618cL69RKPAMxPZhOLMF4lbaxACDVwAeMnWEWI9iucyp0jVy n+UF4lgdFg5P5Vzr0bvcZM/NgKqJCLNz3a3naLXnzXaqzqyATapm0u72zfOXI1wIJ+sMK35Zb iHSk6gLHIG+Vqo7VOSsenmyKjLppErsAPbwNUlA1dAfwvtAmuouoRcQzPAcRmTawhKRT+SYl7 4d3cEv6XtyFOic4Z/wtsSXn9ML71FjNDsaPfAuznZ5gsI2T4zhkExkGQ16aA6s5jX5cDuNROh lfsMYnd+6PrKUT1smIFB54bL4kYUx7slT7QDUwggEnaM8kTshI7T6bXYtNc1c5C5KeaXvK8Bv k0mX7az7gda/Zxaq0dro0X99+AdADEawZ8yeInQMsr0BwEBlVhaaaYeY8StNEuUGThtVQZdNm tSE/SHwiaUFm2tZlUWLiHLS4/I2R3lG8WB+Vu9PDFqqbjg8ZHHe+M6SYbk22r2wmgWpU= 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 16:10:54 +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/ext4/crypto_key.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c index 442d24e..f8d15ae 100644 --- a/fs/ext4/crypto_key.c +++ b/fs/ext4/crypto_key.c @@ -89,8 +89,7 @@ void ext4_free_crypt_info(struct ext4_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(ext4_crypt_info_cachep, ci); } -- 2.4.4