From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18B14C43603 for ; Thu, 19 Dec 2019 18:45:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E140E24680 for ; Thu, 19 Dec 2019 18:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781113; bh=o0097HBGczPpjO6uj/IUnUpcuRfOFsYqRgOdD/t3OHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KQ1nq2mLqJ+4+Sr7TaWxNn0KBRA2Eca55e2+FZS8FTzHsD5FEjOCgVSaUJxVOhB85 gok/rBuab47jcGNaQTF+5uO1dBeELHuH1mD2CyZx1UFZqqAxGXxOBLoN+U8rFhWvuQ sftn55K7ZvjvcCfANfnOljsNgp6jGt5MQ7ZFLOww= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbfLSSpH (ORCPT ); Thu, 19 Dec 2019 13:45:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:37338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728413AbfLSSpH (ORCPT ); Thu, 19 Dec 2019 13:45:07 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6FA63222C2; Thu, 19 Dec 2019 18:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781106; bh=o0097HBGczPpjO6uj/IUnUpcuRfOFsYqRgOdD/t3OHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=COl3K0YM/czO9sJUC4sf+IckrwnzDZsinx2g3txz1KgDbzQrk3UcbILAosoyS4I49 Zi0FftifBTCbZ3oqnooqQVmBtAyFlRmewSVY1WP+IcgWUSGC8gIi3O1as4khrhGwM4 crgpyvUbg7g03Gwyv2tH8cKwRfy4A+vwsozzz2rI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , David Teigland , Sasha Levin Subject: [PATCH 4.9 046/199] dlm: NULL check before kmem_cache_destroy is not needed Date: Thu, 19 Dec 2019 19:32:08 +0100 Message-Id: <20191219183217.492770079@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wen Yang [ Upstream commit f31a89692830061bceba8469607e4e4b0f900159 ] kmem_cache_destroy(NULL) is safe, so removes NULL check before freeing the mem. This patch also fix ifnullfree.cocci warnings. Signed-off-by: Wen Yang Signed-off-by: David Teigland Signed-off-by: Sasha Levin --- fs/dlm/memory.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c index 7cd24bccd4fe5..37be29f21d04d 100644 --- a/fs/dlm/memory.c +++ b/fs/dlm/memory.c @@ -38,10 +38,8 @@ int __init dlm_memory_init(void) void dlm_memory_exit(void) { - if (lkb_cache) - kmem_cache_destroy(lkb_cache); - if (rsb_cache) - kmem_cache_destroy(rsb_cache); + kmem_cache_destroy(lkb_cache); + kmem_cache_destroy(rsb_cache); } char *dlm_allocate_lvb(struct dlm_ls *ls) @@ -86,8 +84,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb) struct dlm_user_args *ua; ua = lkb->lkb_ua; if (ua) { - if (ua->lksb.sb_lvbptr) - kfree(ua->lksb.sb_lvbptr); + kfree(ua->lksb.sb_lvbptr); kfree(ua); } } -- 2.20.1