iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix nested transaction restart handling in bch2_bucket_gens_init()

Browse Source 
Nested transaction restart handling is typically best avoided; when the
inner context handles a transaction restart it invalidates the outer
transaction context, so we need to make sure to return a
transaction_restart_nested error.

This code wasn't doing that, and hit the assertion in
for_each_btree_key() that checks for that via trans->restart_count.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2024-03-17 20:32:36 -04:00
parent 3becdd4850
commit 1ba6f48f09
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/bcachefs/alloc_background.c
View File

@@ -532,13 +532,13 @@ int bch2_bucket_gens_init(struct bch_fs *c)
u8 gen = bch2_alloc_to_v4(k, &a)->gen; u8 gen = bch2_alloc_to_v4(k, &a)->gen;
unsigned offset; unsigned offset;
struct bpos pos = alloc_gens_pos(iter.pos, &offset); struct bpos pos = alloc_gens_pos(iter.pos, &offset);
int ret2 = 0;
if (have_bucket_gens_key && bkey_cmp(iter.pos, pos)) { if (have_bucket_gens_key && bkey_cmp(iter.pos, pos)) {
ret = commit_do(trans, NULL, NULL, ret2 = bch2_btree_insert_trans(trans, BTREE_ID_bucket_gens, &g.k_i, 0) ?:
BCH_TRANS_COMMIT_no_enospc, bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);
bch2_btree_insert_trans(trans, BTREE_ID_bucket_gens, &g.k_i, 0)); if (ret2)
if (ret) goto iter_err;
break;
have_bucket_gens_key = false; have_bucket_gens_key = false;
} }
@@ -549,7 +549,8 @@ int bch2_bucket_gens_init(struct bch_fs *c)
} }
g.v.gens[offset] = gen; g.v.gens[offset] = gen;
0; iter_err:
ret2;
})); }));
if (have_bucket_gens_key && !ret) if (have_bucket_gens_key && !ret)