diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-04-10 05:23:08 +0200 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-08 23:29:19 +0200 |
| commit | ca563dccb2f0fb9b77971dcbead37b7e5f75723d (patch) | |
| tree | dd4d9122e0130ade6773216328de3cb06ffa10fa /fs/bcachefs/alloc_background.c | |
| parent | bcachefs: Use bch2_btree_path_upgrade() in key cache traverse (diff) | |
| download | linux-ca563dccb2f0fb9b77971dcbead37b7e5f75723d.tar.xz linux-ca563dccb2f0fb9b77971dcbead37b7e5f75723d.zip | |
bcachefs: bch2_trans_unlock() must always be followed by relock() or begin()
We're about to add new asserts for btree_trans locking consistency, and
part of that requires that aren't using the btree_trans while it's
unlocked.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/alloc_background.c')
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 2f91ff67453f..f07373b78174 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -2172,6 +2172,9 @@ int bch2_bucket_io_time_reset(struct btree_trans *trans, unsigned dev, u64 now; int ret = 0; + if (bch2_trans_relock(trans)) + bch2_trans_begin(trans); + a = bch2_trans_start_alloc_update(trans, &iter, POS(dev, bucket_nr)); ret = PTR_ERR_OR_ZERO(a); if (ret) |