From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753521AbbFZOVz (ORCPT ); Fri, 26 Jun 2015 10:21:55 -0400 Received: from mout.web.de ([212.227.17.11]:57892 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbbFZOVt (ORCPT ); Fri, 26 Jun 2015 10:21:49 -0400 Message-ID: <558D5FF6.9030401@users.sourceforge.net> Date: Fri, 26 Jun 2015 16:21:42 +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] fs-ext4 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> <558D5EB4.30803@users.sourceforge.net> In-Reply-To: <558D5EB4.30803@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:AaPTJFK3vWOAG4FmbKViePN+i4oLE729pZ8I+mJl3C/jdzuUAzF pyscvCAegcdntyzDGGglA9TiiiTl2HWoB34vtpDkpQLS/Q0LLhb+jJKCmaaef8fN0EHomUZ EsC8THtGalJJ42HdUJqJJRyfYnT8xYmNeXGEl6UlqCUQzCxtPOW5NZgN7f8XXOujA+DEwvj 4izwhMzCPADvAM2pDs0mA== X-UI-Out-Filterresults: notjunk:1;V01:K0:oomis6cA4JA=:nX99zMT2IOTNoW7oVaSxcL rIr/ogBAakfjCKFc7G8pQx291hk6Ne1bG7siXFO45pMDwK3G50KqI7/q8B8BqwTqGwDYamY61 omcpVtmoND1XSBqEtW1+jUQjNUcuRc7aqymOlfwJAB4mVUrwgweDr2rvvU4FeKph2QdE5kIKA tfev7xJYjShxnaW+5qKR6SxNvYTA7rcz71ntQ1CYAStJXBNo9AFxpPWy2Dho6l4KGXHjeBavN op/LBGgI4nK/+HV/KNKX81+LPShVaXuWWA8maDzzSZ11xUOg5jT1IoryJA+E1p/Lsm8cbKq3h FymqA/yA+2Bf0RYooU7BmH6iQF1EE7zGXQonJ++SysJrWmkJQLrlioaAe7hfzZpC8saNxkPQj zb5yblN5yHZ7J95IddMi9aZVGuyN+l1Rrwo//Xk1JkirC9EGDrb+qzV+mybhX7kTnFR7eS5iZ AFxoeO3bqTM1YOtm601qBqQxyKlgO7/+Tzmdh3Q/5UOF+w9NxtTsRN8tqEvIkIQqNLFKBFUx/ eV3tVGg9V7PIkteZvVFT2noaSdvIIwVA+jLlUFrgIBRSoqXRrrD7r8R0CUELWQoIilKFlvTOS 8fjot4ZBhdS0HbunMYbzzPQyShknqOO/HCx9/UDLFFhPDpYUKiNytqfDrn6hxwAzRelaCT5g0 j7XtlrkgmjjA1wKnPMobvZkMWKEwwPGRkT15gqHHbrg6pbtdQ59Yf/j6pXwYfmAKfXe8= 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 Subject: [PATCH] fs-ext4 crypto: Delete an unnecessary check before the function call "key_put" 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