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 da224776eb bcachefs: fix an error path

Browse Source
This commit is contained in:
Kent Overstreet 2018-03-01 18:33:14 -05:00
parent 8a57b1f1d5
commit 2bb8cdfc75
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
e7f4678827ad7bf7e294105e7bb3a53e04474070 da224776eb43b7a47d8c7cd9314d5d1a8e97aabe

7
libbcachefs/btree_io.c
View File

@ -947,7 +947,7 @@ enum btree_validate_ret {
#define btree_err(type, c, b, i, msg, ...) \ #define btree_err(type, c, b, i, msg, ...) \
({ \ ({ \
char _buf[200], *out = _buf, *end = out + sizeof(_buf); \ char _buf[300], *out = _buf, *end = out + sizeof(_buf); \
\ \
out += btree_err_msg(c, b, i, b->written, write, out, end - out);\ out += btree_err_msg(c, b, i, b->written, write, out, end - out);\
out += scnprintf(out, end - out, ": " msg, ##__VA_ARGS__); \ out += scnprintf(out, end - out, ": " msg, ##__VA_ARGS__); \
@ -1103,7 +1103,7 @@ static int validate_bset(struct bch_fs *c, struct btree *b,
bch2_bkey_val_to_text(c, type, buf, sizeof(buf), u); bch2_bkey_val_to_text(c, type, buf, sizeof(buf), u);
btree_err(BTREE_ERR_FIXABLE, c, b, i, btree_err(BTREE_ERR_FIXABLE, c, b, i,
"invalid bkey %s: %s", buf, invalid); "invalid bkey:\n%s\n%s", buf, invalid);
i->u64s = cpu_to_le16(le16_to_cpu(i->u64s) - k->u64s); i->u64s = cpu_to_le16(le16_to_cpu(i->u64s) - k->u64s);
memmove_u64s_down(k, bkey_next(k), memmove_u64s_down(k, bkey_next(k),
@ -1192,7 +1192,6 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
sectors = vstruct_sectors(b->data, c->block_bits); sectors = vstruct_sectors(b->data, c->block_bits);
set_btree_bset(b, b->set, &b->data->keys);
btree_node_set_format(b, b->data->format); btree_node_set_format(b, b->data->format);
} else { } else {
bne = write_block(b); bne = write_block(b);
@ -1258,6 +1257,8 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
sorted = btree_bounce_alloc(c, btree_page_order(c), &used_mempool); sorted = btree_bounce_alloc(c, btree_page_order(c), &used_mempool);
sorted->keys.u64s = 0; sorted->keys.u64s = 0;
set_btree_bset(b, b->set, &b->data->keys);
b->nr = btree_node_is_extents(b) b->nr = btree_node_is_extents(b)
? bch2_extent_sort_fix_overlapping(c, &sorted->keys, b, iter) ? bch2_extent_sort_fix_overlapping(c, &sorted->keys, b, iter)
: bch2_key_sort_fix_overlapping(&sorted->keys, b, iter); : bch2_key_sort_fix_overlapping(&sorted->keys, b, iter);