diff options
| author | Dave Airlie <[email protected]> | 2023-08-23 21:26:06 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2023-08-23 21:26:06 +0000 |
| commit | fdebffeba8b877368ddcc139c26278c1c97931a4 (patch) | |
| tree | 5ebf85a3e26d55ea388aa7a8608222205a4d59ba /fs/jbd2/commit.c | |
| parent | Merge tag 'amd-drm-next-6.6-2023-08-18' of https://gitlab.freedesktop.org/agd... (diff) | |
| parent | Linux 6.5-rc7 (diff) | |
| download | kernel-fdebffeba8b877368ddcc139c26278c1c97931a4.tar.gz kernel-fdebffeba8b877368ddcc139c26278c1c97931a4.zip | |
BackMerge tag 'v6.5-rc7' into drm-next
Linux 6.5-rc7
This is needed for the CI stuff and the msm pull has fixes in it.
Signed-off-by: Dave Airlie <[email protected]>
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); } |