diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:37:14 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:37:14 +0100 |
| commit | c432bdcf39d52cbba7487d4ebfcf735cee59481e (patch) | |
| tree | 5235fe21993c9fb04cbada15ed940961068258c3 /fs/bcachefs/btree_trans_commit.c | |
| parent | 36ccabe59ddacefd79b7dfa4a66359385f22eed4 (diff) | |
| parent | d082ecbc71e9e0bf49883ee4afd435a77a5101b6 (diff) | |
pmdomain: Merge tag 'v6.14-rc4' from Linus into next
Linux 6.14-rc4
Diffstat (limited to 'fs/bcachefs/btree_trans_commit.c')
| -rw-r--r-- | fs/bcachefs/btree_trans_commit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c index 2760dd9569ed..c4f524b2ca9a 100644 --- a/fs/bcachefs/btree_trans_commit.c +++ b/fs/bcachefs/btree_trans_commit.c @@ -999,6 +999,10 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags) bch2_trans_verify_not_unlocked_or_in_restart(trans); + ret = trans_maybe_inject_restart(trans, _RET_IP_); + if (unlikely(ret)) + goto out_reset; + if (!trans->nr_updates && !trans->journal_entries_u64s) goto out_reset; |