Received: by 10.223.176.5 with SMTP id f5csp140713wra; Mon, 5 Feb 2018 18:31:17 -0800 (PST) X-Google-Smtp-Source: AH8x227iTyfqbny1uGH5iMPBPiKNs6vIGfqrWzryLJ4MfXCs4gDsmcIbEOiE58g5UH14YPSMVQcJ X-Received: by 10.98.201.152 with SMTP id l24mr836915pfk.199.1517884277783; Mon, 05 Feb 2018 18:31:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517884277; cv=none; d=google.com; s=arc-20160816; b=jitdvzJAyxEGI/1o7veTTEMYXxdR+elAgCW1rKYkA6/a6upgT3y0xX5+OqrcKy3Kz4 KT8ZO2ruZFIP4YSKUm+Mj2S5qHvdAlesx0VKnbJs6QXW1HPWPY0U7MVG+QtskthmpKbr pQN/TTK2Z5GC3/jkkGKr4J6QFnsbZplP5wGJ6jyg+EejcLafRmg+hyJHi5VhUe0o4Xhd dwqbG47yJAgIap//24iG4PxY04rzCwdhN4XPyK8xXcXXc7e3YHSpmdqPAZHWVjg1+DnK flxds2B+uKCeHzgRt/EPomZA/Jx2PkTqTz/f/23GmHGTfeHHDYoMzNGlWFOa/ISDWqgP oACQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature:dkim-filter :arc-authentication-results; bh=7f3VkhK4kOSMV0+zkGnq3PU2GDwGIbFZL5SQPharGbk=; b=jCbR9BMFgUpY795HLMYPll7a6asmbFtO2j9EBRlaIfShtl3HGzmLg7lzfwkJTU1Oge xjDPH3p1Acq8qyOiNwY40lBL8MxytoDY+UmyFUzMD3O5k0Td79oZJCAzj2/OJqL+ZQDc zRguye62wMzggYQaVl/Nyw2JHgnPl2hOQbBvWNuGnlvxSiXSIucTYSlh1cGd+sF+Qv7E Q7Njvr52v9Vq3ldGT7RV6v4vqt6bNh8pXikFsM8mrHc/Ln9mpc7KT1QlDrgmdt8BTIX/ tHXRBYZ1xhi3Skbpdso28y/Sz0TTmdB78cMUzwJRC5lYIg+7N45GwJmEOHJgW06fieHg oYHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meituan.com header.s=20130113 header.b=UL28UCTO; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=meituan.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m10-v6si265758plt.185.2018.02.05.18.31.03; Mon, 05 Feb 2018 18:31:17 -0800 (PST) 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; dkim=pass header.i=@meituan.com header.s=20130113 header.b=UL28UCTO; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=meituan.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbeBFC37 (ORCPT + 99 others); Mon, 5 Feb 2018 21:29:59 -0500 Received: from mx-fe5-210.meituan.com ([103.37.138.210]:36007 "EHLO mx02.meituan.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752165AbeBFC3w (ORCPT ); Mon, 5 Feb 2018 21:29:52 -0500 Received: from localhost (localhost [127.0.0.1]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTP id 6492C2975CBD; Tue, 6 Feb 2018 10:29:48 +0800 (CST) Received: from mx02.meituan.com ([127.0.0.1]) by localhost (dx-it-mx02.dx.sankuai.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BdJGnBGvDIS3; Tue, 6 Feb 2018 10:29:48 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTP id 336A22975CE3; Tue, 6 Feb 2018 10:29:48 +0800 (CST) DKIM-Filter: OpenDKIM Filter v2.9.2 dx-it-mx02.dx.sankuai.com 336A22975CE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meituan.com; s=20130113; t=1517884188; bh=7f3VkhK4kOSMV0+zkGnq3PU2GDwGIbFZL5SQPharGbk=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type: Content-Transfer-Encoding; b=UL28UCTOY7o6n33SQ2QnSmnUDUhZLDuEkf8udBnf1AK2PwFaiIygYbj/Db3LscqOX x0Mz2tCrQaNabUoMJteSt60SNA57lrolgqAHmsJvgcdQmw1bB7Kp///31DXTuP+Hci vfzivN1Vhr2D3RXoqjGS8chuA2gTuqWkgLJI4fDk= X-Virus-Scanned: amavisd-new at dx-it-mx02.dx.sankuai.com Received: from mx02.meituan.com ([127.0.0.1]) by localhost (dx-it-mx02.dx.sankuai.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1dPmZYNguezd; Tue, 6 Feb 2018 10:29:48 +0800 (CST) Received: from wanglongs-MacBook-Pro.local (unknown [103.37.140.11]) by dx-it-mx02.dx.sankuai.com (Postfix) with ESMTPSA id 075C72975CBD; Tue, 6 Feb 2018 10:29:39 +0800 (CST) Subject: Re: [PATCH] jbd2: set to NULL after kmem_cache_destroy To: "Darrick J. Wong" Cc: tytso@mit.edu, jack@suse.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org References: <1517837957-1636-1-git-send-email-wanglong19@meituan.com> <20180205170006.GA4838@magnolia> From: Wang Long Message-ID: <1fb20a12-8482-fea8-1db2-ff764216ea19@meituan.com> Date: Tue, 6 Feb 2018 10:29:40 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <20180205170006.GA4838@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/2/2018 1:00 AM, Darrick J. Wong wrote: > On Mon, Feb 05, 2018 at 09:39:17PM +0800, Wang Long wrote: >> Signed-off-by: Wang Long >> --- >> fs/jbd2/journal.c | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c >> index 93016bb..38dc24c 100644 >> --- a/fs/jbd2/journal.c >> +++ b/fs/jbd2/journal.c >> @@ -2649,11 +2649,14 @@ static int __init jbd2_journal_init_handle_cache(void) >> >> static void jbd2_journal_destroy_handle_cache(void) >> { >> - if (jbd2_handle_cache) >> + if (jbd2_handle_cache) { >> kmem_cache_destroy(jbd2_handle_cache); > kmem_cache_destroy already handles null pointers, so you can remove the > conditional test entirely. > > --D Thanks, I will send another patch to remove all conditional test in module JBD2. >> - if (jbd2_inode_cache) >> + jbd2_handle_cache = NULL; >> + } >> + if (jbd2_inode_cache) { >> kmem_cache_destroy(jbd2_inode_cache); >> - >> + jbd2_inode_cache = NULL; >> + } >> } >> >> /* >> -- >> 1.8.3.1 >>