diff options
| author | Dmitry Torokhov <[email protected]> | 2023-11-06 23:42:08 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-11-06 23:42:08 +0000 |
| commit | cdd5b5a9761fd66d17586e4f4ba6588c70e640ea (patch) | |
| tree | aba8409818be01f6af8683bf76594c790942d0bc /fs/jbd2/commit.c | |
| parent | Input: powermate - fix use-after-free in powermate_config_complete (diff) | |
| parent | Input: walkera0701 - use module_parport_driver macro to simplify the code (diff) | |
| download | kernel-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.tar.gz kernel-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.7 merge window.
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index b33155dd7001..1073259902a6 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -1141,8 +1141,7 @@ restart_loop: spin_lock(&journal->j_list_lock); commit_transaction->t_state = T_FINISHED; /* Check if the transaction can be dropped now that we are finished */ - if (commit_transaction->t_checkpoint_list == NULL && - commit_transaction->t_checkpoint_io_list == NULL) { + if (commit_transaction->t_checkpoint_list == NULL) { __jbd2_journal_drop_transaction(journal, commit_transaction); jbd2_journal_free_transaction(commit_transaction); } |