diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
| commit | 770493524e9f623826765eb97c64d699f4752e4f (patch) | |
| tree | 304c718009aa32834511d45497adb8acba496088 /fs/bcachefs/btree_trans_commit.c | |
| parent | e4f7cc8c36e7cab391683db682402ab2f185bf92 (diff) | |
| parent | fe0fb58325e519008e2606a5aa2cff7ad23e212d (diff) | |
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
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 2760dd9569ed9..c4f524b2ca9a0 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; |