Skip to content

Commit f7c3dc2

Browse files
author
Kent Overstreet
committed
bcachefs: btree node scan now fills in sectors_written
Signed-off-by: Kent Overstreet <[email protected]>
1 parent ae92765 commit f7c3dc2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

fs/bcachefs/btree_node_scan.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,25 @@ static void found_btree_node_to_key(struct bkey_i *k, const struct found_btree_n
5757
bp->v.seq = cpu_to_le64(f->cookie);
5858
bp->v.sectors_written = 0;
5959
bp->v.flags = 0;
60+
bp->v.sectors_written = cpu_to_le16(f->sectors_written);
6061
bp->v.min_key = f->min_key;
6162
SET_BTREE_PTR_RANGE_UPDATED(&bp->v, f->range_updated);
6263
memcpy(bp->v.start, f->ptrs, sizeof(struct bch_extent_ptr) * f->nr_ptrs);
6364
}
6465

6566
static bool found_btree_node_is_readable(struct btree_trans *trans,
66-
const struct found_btree_node *f)
67+
struct found_btree_node *f)
6768
{
6869
struct { __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX); } k;
6970

7071
found_btree_node_to_key(&k.k, f);
7172

7273
struct btree *b = bch2_btree_node_get_noiter(trans, &k.k, f->btree_id, f->level, false);
7374
bool ret = !IS_ERR_OR_NULL(b);
74-
if (ret)
75+
if (ret) {
76+
f->sectors_written = b->written;
7577
six_unlock_read(&b->c.lock);
78+
}
7679

7780
/*
7881
* We might update this node's range; if that happens, we need the node

fs/bcachefs/btree_node_scan_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ struct found_btree_node {
99
bool overwritten:1;
1010
u8 btree_id;
1111
u8 level;
12+
unsigned sectors_written;
1213
u32 seq;
1314
u64 cookie;
1415

0 commit comments

Comments
 (0)