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 4d1d53862afb bcachefs: show none if label is not set

Browse Source
This commit is contained in:
Kent Overstreet 2024-07-14 15:17:05 -04:00
parent 6687933bdb
commit 386ae4e0c0
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
e9a4628eddaa137ebd4bfb0f232503268992d15f
4d1d53862afb768e4edcf7256f8fe0634c96b40e

38
libbcachefs/btree_node_scan.c
View File

@ -330,37 +330,15 @@ again:
} else if (n->level) {
n->overwritten = true;
} else {
struct printbuf buf = PRINTBUF;
prt_str(&buf, "overlapping btree nodes with same seq! halting\n ");
found_btree_node_to_text(&buf, c, start);
prt_str(&buf, "\n ");
found_btree_node_to_text(&buf, c, n);
bch_err(c, "%s", buf.buf);
printbuf_exit(&buf);
struct { __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX); } tmp;
struct btree *b;
struct btree_trans *trans = bch2_trans_get(c);
found_btree_node_to_key(&tmp.k, start);
b = bch2_btree_node_get_noiter(trans, &tmp.k,
start->btree_id, start->level, false);
if (!IS_ERR_OR_NULL(b)) {
bch2_dump_btree_node(c, b);
six_unlock_read(&b->c.lock);
if (bpos_cmp(start->max_key, n->max_key) >= 0)
n->overwritten = true;
else {
n->range_updated = true;
n->min_key = bpos_successor(start->max_key);
n->range_updated = true;
bubble_up(n, end);
goto again;
}
found_btree_node_to_key(&tmp.k, n);
b = bch2_btree_node_get_noiter(trans, &tmp.k,
start->btree_id, start->level, false);
if (!IS_ERR_OR_NULL(b)) {
bch2_dump_btree_node(c, b);
six_unlock_read(&b->c.lock);
}
bch2_trans_put(trans);
return -BCH_ERR_fsck_repair_unimplemented;
}
}