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

cmd_list: Fix -m nodes_ondisk

Browse Source 
We were using malloc() for a buffer to be used for an O_DIRECT read -
oops, that doesn't work.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-07-21 15:46:57 -04:00
parent b47d99c2bf
commit a6128b5335
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd_list.c
View File

@ -109,6 +109,7 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
struct bch_dev *ca; struct bch_dev *ca;
struct bio *bio; struct bio *bio;
unsigned offset = 0; unsigned offset = 0;
int ret;
if (bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&b->key), NULL, &pick) <= 0) { if (bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&b->key), NULL, &pick) <= 0) {
printf("error getting device to read from\n"); printf("error getting device to read from\n");
@ -121,7 +122,7 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
return; return;
} }
n_ondisk = malloc(btree_bytes(c)); n_ondisk = aligned_alloc(block_bytes(c), btree_bytes(c));
bio = bio_alloc_bioset(ca->disk_sb.bdev, bio = bio_alloc_bioset(ca->disk_sb.bdev,
buf_pages(n_ondisk, btree_bytes(c)), buf_pages(n_ondisk, btree_bytes(c)),
@ -131,7 +132,9 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
bio->bi_iter.bi_sector = pick.ptr.offset; bio->bi_iter.bi_sector = pick.ptr.offset;
bch2_bio_map(bio, n_ondisk, btree_bytes(c)); bch2_bio_map(bio, n_ondisk, btree_bytes(c));
submit_bio_wait(bio); ret = submit_bio_wait(bio);
if (ret)
die("error reading btree node: %i", ret);
bio_put(bio); bio_put(bio);
percpu_ref_put(&ca->io_ref); percpu_ref_put(&ca->io_ref);
@ -147,7 +150,8 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
i = &n_ondisk->keys; i = &n_ondisk->keys;
if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i))) if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
die("unknown checksum type"); die("unknown checksum type at offset %u: %llu",
offset, BSET_CSUM_TYPE(i));
nonce = btree_nonce(i, offset << 9); nonce = btree_nonce(i, offset << 9);
csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, n_ondisk); csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, n_ondisk);
@ -167,7 +171,8 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
break; break;
if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i))) if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
die("unknown checksum type"); die("unknown checksum type at offset %u: %llu",
offset, BSET_CSUM_TYPE(i));
nonce = btree_nonce(i, offset << 9); nonce = btree_nonce(i, offset << 9);
csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne); csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);