diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-26 21:36:39 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-27 21:36:36 -0500 |
commit | 30cca2e94d0dfa8c3151daf1393f402d32bb9407 (patch) | |
tree | cbf1b7ccfdcaace597389147c27031c0e8106f12 /libbcachefs/btree_write_buffer.c | |
parent | bf359ac1ad97929e1023632aafb272d655504516 (diff) |
Update bcachefs sources to ca97ee3577 bcachefs: bch2_btree_iter_peek_and_restart_outlined()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_write_buffer.c')
-rw-r--r-- | libbcachefs/btree_write_buffer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libbcachefs/btree_write_buffer.c b/libbcachefs/btree_write_buffer.c index 6285532e..026c249a 100644 --- a/libbcachefs/btree_write_buffer.c +++ b/libbcachefs/btree_write_buffer.c @@ -64,6 +64,15 @@ static int bch2_btree_write_buffer_flush_one(struct btree_trans *trans, bch2_btree_insert_key_leaf(trans, path, &wb->k, wb->journal_seq); (*fast)++; + + if (path->ref > 1) { + /* + * We can't clone a path that has write locks: if the path is + * shared, unlock before set_pos(), traverse(): + */ + bch2_btree_node_unlock_write(trans, path, path->l[0].b); + *write_locked = false; + } return 0; trans_commit: return bch2_trans_update(trans, iter, &wb->k, 0) ?: |