alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to fb365e1745

Browse Source
This commit is contained in:
Kent Overstreet 2017-04-24 09:48:35 -08:00
parent e41920e603
commit 5db58a0bae
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
2e70771b8dc0d0f2d0356a5a7d16cab9430cd49e
fb365e1745d352401a2af47aedb43ab1bf6f8ce1

7
libbcachefs/btree_iter.c
View File

@ -704,8 +704,12 @@ static void btree_iter_prefetch(struct btree_iter *iter)
struct bkey_packed *k;
BKEY_PADDED(k) tmp;
unsigned nr = iter->level ? 1 : 8;
bool was_locked = btree_node_locked(iter, iter->level + 1);
while (nr) {
if (!bch2_btree_node_relock(iter, iter->level + 1))
return;
bch2_btree_node_iter_advance(&node_iter, b);
k = bch2_btree_node_iter_peek(&node_iter, b);
if (!k)
@ -714,6 +718,9 @@ static void btree_iter_prefetch(struct btree_iter *iter)
bch2_bkey_unpack(b, &tmp.k, k);
bch2_btree_node_prefetch(iter, &tmp.k, iter->level);
}
if (!was_locked)
btree_node_unlock(iter, iter->level + 1);
}
static inline int btree_iter_down(struct btree_iter *iter)