diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-12 14:38:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-12 14:42:54 -0400 |
| commit | a1764e00cde2c0de798588782f2cc5a2bb307045 (patch) | |
| tree | 853d825c8b10f560ab55d72f1930c5db27f4d3d0 /libbcachefs/btree_node_scan.c | |
| parent | 4be409afea5fb4325eecf78d29dc463fcd9c3e31 (diff) | |
Update bcachefs sources to 47d1e7a86242 bcachefs: drop packed, aligned from bkey_inode_bufv1.9.3
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_node_scan.c')
| -rw-r--r-- | libbcachefs/btree_node_scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbcachefs/btree_node_scan.c b/libbcachefs/btree_node_scan.c index 2cb0442f..ddc5ada3 100644 --- a/libbcachefs/btree_node_scan.c +++ b/libbcachefs/btree_node_scan.c @@ -76,6 +76,7 @@ static bool found_btree_node_is_readable(struct btree_trans *trans, return ret; f->sectors_written = b->written; + f->journal_seq = le64_to_cpu(b->data->keys.journal_seq); six_unlock_read(&b->c.lock); /* @@ -105,7 +106,8 @@ static int found_btree_node_cmp_cookie(const void *_l, const void *_r) static int found_btree_node_cmp_time(const struct found_btree_node *l, const struct found_btree_node *r) { - return cmp_int(l->seq, r->seq); + return cmp_int(l->seq, r->seq) ?: + cmp_int(l->journal_seq, r->seq); } static int found_btree_node_cmp_pos(const void *_l, const void *_r) |