diff options
author | 2023-07-23 23:34:06 +0100 | |
---|---|---|
committer | 2023-07-23 23:34:06 +0100 | |
commit | 9c214af0bd0f43df214470a35bc38dd5602b666f (patch) | |
tree | e95ac46b8fdca90a122b73eac96158985d85ef70 /fs/jbd2/commit.c | |
parent | regmap: Remove dynamic allocation warnings for rbtree and maple (diff) | |
parent | Linux 6.5-rc3 (diff) | |
download | wireguard-linux-9c214af0bd0f43df214470a35bc38dd5602b666f.tar.xz wireguard-linux-9c214af0bd0f43df214470a35bc38dd5602b666f.zip |
regmap: Merge up fixes from mainline
There's several things here that will really help my CI.
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); } |