diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-15 14:41:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:57 -0400 |
| commit | 56cc033dfcf002eb8a957097fe7290546829b7c0 (patch) | |
| tree | fae78c7328e94d59e169f228f70815b55cea410a | |
| parent | 26559553e47c9f2a14b5254cb307fc755ac316c8 (diff) | |
| download | lwn-56cc033dfcf002eb8a957097fe7290546829b7c0.tar.gz lwn-56cc033dfcf002eb8a957097fe7290546829b7c0.zip | |
bcachefs: Don't run transaction hooks multiple times
transaction hooks aren't supposed to run unless we know the transaction
is going to commit succesfully: this fixes a bug with attempting to
delete a subvolume multiple times.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 19efd484fc9d..f608e1c92285 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -622,14 +622,6 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, prefetch(&trans->c->journal.flags); - h = trans->hooks; - while (h) { - ret = h->fn(trans, h); - if (ret) - return ret; - h = h->next; - } - trans_for_each_update(trans, i) { /* Multiple inserts might go to same leaf: */ if (!same_leaf_as_prev(trans, i)) @@ -696,6 +688,14 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, goto revert_fs_usage; } + h = trans->hooks; + while (h) { + ret = h->fn(trans, h); + if (ret) + goto revert_fs_usage; + h = h->next; + } + trans_for_each_update(trans, i) if (BTREE_NODE_TYPE_HAS_MEM_TRIGGERS & (1U << i->bkey_type)) { ret = run_one_mem_trigger(trans, i, i->flags); |