diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-26 15:48:39 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:54 -0400 |
| commit | 747ded6ddfe88eb9644ee0512c061e46fe2fb09d (patch) | |
| tree | 49e3a7fa17faa7c8505192f07d932eed1f79c17a /fs/bcachefs/btree_write_buffer.c | |
| parent | 39a1ea129a6906a0d6127036222bdb68ec01a277 (diff) | |
| download | linux-747ded6ddfe88eb9644ee0512c061e46fe2fb09d.tar.gz linux-747ded6ddfe88eb9644ee0512c061e46fe2fb09d.tar.bz2 linux-747ded6ddfe88eb9644ee0512c061e46fe2fb09d.zip | |
bcachefs: Fix for shared paths in write buffer flush
It's possible for bch2_write_buffer_flush_one() to end up with a shared
path, if called from a context that already has a btree iterator
pointing to a key being flushed. We have to be careful when that
happens, since we can't clone a path that holds write locks.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_write_buffer.c')
| -rw-r--r-- | fs/bcachefs/btree_write_buffer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_write_buffer.c b/fs/bcachefs/btree_write_buffer.c index 6285532e7790..026c249a3f44 100644 --- a/fs/bcachefs/btree_write_buffer.c +++ b/fs/bcachefs/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) ?: |