From patchwork Sat Nov 5 06:00:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 15890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp829016wru; Fri, 4 Nov 2022 23:02:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zwZmjkKf+JILtckrB4WzKz3FBVpBon1BdhwA8rRMHhnPDP06jsVOfxnnhjFA9SB5UZMxK X-Received: by 2002:a17:902:be13:b0:188:5c4d:589d with SMTP id r19-20020a170902be1300b001885c4d589dmr10475290pls.114.1667628169724; Fri, 04 Nov 2022 23:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667628169; cv=none; d=google.com; s=arc-20160816; b=HooMNOZw/QUZ8kMnZKJ1kYxV10FyD2JqtSsNGhhmVM+GvrhqtSWsSXMHfpXDUIzI4E A/d7u/G/HBw4SM3Qiw7XCpkUwjTQ35QtTzlFQDeAKjVoyGVAP7ik+9OyelnCMCwPGpWI 9RrH1mpM+5adac1q3fFBegd8DJmzLlSB2seJs124tQUUCGjLgPYGLTeNszgKpGF+Zvoq AwbetynJqrIlFpKDxFTNpWCQxjrfywZJTGxcImW+23L7PvBQ9gJZfCujavHRAj8yuI6F 3xWylozJAjkXKrMUZswbGJ1DmB/7rw/nBLP5ES/wGEmO3TaQTZLXgumn2MfeQi/1GWJo CeJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=SU7+7a/wIwLKABvOHsgNpsUn/a9DDqd/g8Af6t4M+90=; b=pd5o2Z5wmwvb6+8yxa9al71/lNJ4MjnpIJrZzttYujlWeKFqH2IeVdMw8/TwsT1NQr Lat08emkDy4MrcSl06t8cMrVWpAlbGATmimJrWEZf+xg5kSsg7AGUqG8SC/1sSEgmFbU ltRSg2UbeHmiuHL6jDriRGqYevRrEwnEhkw/6mmP3VDfWUi0rxeqkuz8jWEJApHzaJxx xvw/UJTmmYlqN91trQQq7m0dyai/kCb7pIGxnqiWhFiQF0RIznnNiU18/cf7ZAchsuWE Kg1ICh/w8frqGrR/1wlDM4bUXRF1COtUwYMJQGHObnz7GCp0JPA9XwXSphe3K/dtBqWh NH1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ji22-20020a170903325600b00174418919a6si1699116plb.513.2022.11.04.23.02.36; Fri, 04 Nov 2022 23:02:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229489AbiKEGB4 (ORCPT + 99 others); Sat, 5 Nov 2022 02:01:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbiKEGBf (ORCPT ); Sat, 5 Nov 2022 02:01:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CB463055C; Fri, 4 Nov 2022 23:01:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DCD35B830C2; Sat, 5 Nov 2022 06:01:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91D10C433D7; Sat, 5 Nov 2022 06:01:31 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orCFj-007OtV-2V; Sat, 05 Nov 2022 02:01:59 -0400 Message-ID: <20221105060159.614390819@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 02:00:50 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , "Theodore Tso" , Jan Kara , linux-ext4@vger.kernel.org Subject: [PATCH v4a 26/38] timers: jbd2: Use timer_shutdown() before freeing timer References: <20221105060024.598488967@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748634875298987302?= X-GMAIL-MSGID: =?utf-8?q?1748634875298987302?= From: "Steven Rostedt (Google)" Before a timer is freed, timer_shutdown() must be called. Note that it is assumed that the timer is not running while being freed, so only timer_shutdown() is used, and not timer_shutdown_sync(). Link: https://lore.kernel.org/all/20221104054053.431922658@goodmis.org/ Cc: "Theodore Ts'o" Cc: Jan Kara Cc: linux-ext4@vger.kernel.org Signed-off-by: Steven Rostedt (Google) --- fs/jbd2/journal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 2696f43e7239..57d2445d8c8b 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2157,6 +2157,8 @@ int jbd2_journal_destroy(journal_t *journal) J_ASSERT(journal->j_checkpoint_transactions == NULL); spin_unlock(&journal->j_list_lock); + timer_shutdown(&journal->j_commit_timer); + /* * OK, all checkpoint transactions have been checked, now check the * write out io error flag and abort the journal if some buffer failed