| Message ID | 20221104054917.365008421@goodmis.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | timers: Use timer_shutdown*() before freeing timers | expand |
On Fri 04-11-22 01:41:23, Steven Rostedt wrote: > From: "Steven Rostedt (Google)" <rostedt@goodmis.org> > > 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/20220407161745.7d6754b3@gandalf.local.home/ > > Cc: "Theodore Ts'o" <tytso@mit.edu> > Cc: Jan Kara <jack@suse.com> > Cc: linux-ext4@vger.kernel.org > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > 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 > -- > 2.35.1
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