Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp968151imm; Wed, 8 Aug 2018 08:36:18 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyPT77Ih7NJGCeZBwQahZw9QyayvOGdO8pLG3LQ7RGc/GbIqjhm9yOnca0VKMmdMzD/QY/T X-Received: by 2002:a65:52cc:: with SMTP id z12-v6mr3068993pgp.69.1533742578289; Wed, 08 Aug 2018 08:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533742578; cv=none; d=google.com; s=arc-20160816; b=B0mwCSZLO9tC1q+JvkrnKOu6K80VQFTp/EjED9jClUK30o0H6pSYgM6QyWNF9jo64b o0iFSXkzsPFqKrFxr0zcPKWO46MsGxpaefZRt8FO8fwGIuH5+gJW1/bAvZOM8hOAJ0rS XtafeempwusFs74KSsWm8ta02Y4jOfvaBdGR1o70o8wKSrOoDSp1pktrBoxJD2KToZJg fb0tvdprZdO2UibY1tNn05dFlhP7WBzZywr1ZN+4qabPBnIZBDj3+NICHJrL4mIuuKF/ NF9vmXeJaXlAgVbxDLMUqmmG4/gkxam9zwfR8LDY3L+5v4h8UR99JyWSzvLA3I2NP+b8 t7Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=BNdLHV6qgCh9+FwQZ7G6O05TVk10UOwipzQSEJfREzM=; b=iltiZElp11bkNmRFUnBQO+MCR3Os02Vc0Yz0Pbjeyk/8CDVR+WG/Zv+VkAGW67DLMV p/295v+a7mMW497m8PPsuWWMGn3c20JLN1pc4OaM39WR3xZdrpu42lph5nrHVUR+IbGB QLAlYzBQzOwUCkg6xt+e7hBISbScwBEGbXheW3M6D2gMoSzLUbJUC2+1rccDSbYfFusm HMekuTt9LHb/Of0bXzGUGOK5BFPRZjwtGGWulY/gCNvDghrbxmnAujBIE/QhDLX4WoED F2fE7BZ0B/JQm2ofK3eaad7xCXkryciDNMXf7HmSGpEKWFhL/Kat5lOw8Bwf6uElyIc/ V9vA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12-v6si3625490pll.384.2018.08.08.08.36.04; Wed, 08 Aug 2018 08:36:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730818AbeHHRyy (ORCPT + 99 others); Wed, 8 Aug 2018 13:54:54 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:10645 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730600AbeHHRyx (ORCPT ); Wed, 8 Aug 2018 13:54:53 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 8F448162D455C; Wed, 8 Aug 2018 23:34:33 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.399.0; Wed, 8 Aug 2018 23:34:29 +0800 From: zhong jiang To: , CC: Subject: [PATCH] drivers/block/drbd: remove the null check for kmem_cache_destroy Date: Wed, 8 Aug 2018 23:22:47 +0800 Message-ID: <1533741767-13055-1-git-send-email-zhongjiang@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kmem_cache_destroy has taken null pointer into account. So it is safe to drop the null check before calling the function. Signed-off-by: zhong jiang --- drivers/block/drbd/drbd_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a80809b..ef8212a 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2103,14 +2103,10 @@ static void drbd_destroy_mempools(void) mempool_exit(&drbd_md_io_page_pool); mempool_exit(&drbd_ee_mempool); mempool_exit(&drbd_request_mempool); - if (drbd_ee_cache) - kmem_cache_destroy(drbd_ee_cache); - if (drbd_request_cache) - kmem_cache_destroy(drbd_request_cache); - if (drbd_bm_ext_cache) - kmem_cache_destroy(drbd_bm_ext_cache); - if (drbd_al_ext_cache) - kmem_cache_destroy(drbd_al_ext_cache); + kmem_cache_destroy(drbd_ee_cache); + kmem_cache_destroy(drbd_request_cache); + kmem_cache_destroy(drbd_bm_ext_cache); + kmem_cache_destroy(drbd_al_ext_cache); drbd_ee_cache = NULL; drbd_request_cache = NULL; -- 1.7.12.4