diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-02-16 07:22:40 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-02-16 07:22:40 -0500 |
| commit | a1e928af839fc088121bf6934d5f6cd493af7611 (patch) | |
| tree | de51985dae155e9afa3ce6e7db46bbeab05ea47f /libbcachefs/buckets.c | |
| parent | 803d749d862f5dfbf1c34e443afb6f279e1d6a48 (diff) | |
Update bcachefs sources to cea583fa17 bcachefs: Only mark iterators nopreserve that aren't in use
Diffstat (limited to 'libbcachefs/buckets.c')
| -rw-r--r-- | libbcachefs/buckets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/buckets.c b/libbcachefs/buckets.c index ea331c6e..eb0eaa98 100644 --- a/libbcachefs/buckets.c +++ b/libbcachefs/buckets.c @@ -700,9 +700,10 @@ static int check_bucket_ref(struct bch_fs *c, if (b_gen != ptr->gen && !ptr->cached) { bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, - "bucket %u:%zu gen %u data type %s: stale dirty ptr (gen %u)\n" + "bucket %u:%zu gen %u (mem gen %u) data type %s: stale dirty ptr (gen %u)\n" "while marking %s", ptr->dev, bucket_nr, b_gen, + *bucket_gen(ca, bucket_nr), bch2_data_types[bucket_data_type ?: ptr_data_type], ptr->gen, (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)); @@ -726,10 +727,9 @@ static int check_bucket_ref(struct bch_fs *c, if ((unsigned) (bucket_sectors + sectors) > U16_MAX) { bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, - "bucket %u:%zu gen %u (mem gen %u) data type %s sector count overflow: %u + %lli > U16_MAX\n" + "bucket %u:%zu gen %u data type %s sector count overflow: %u + %lli > U16_MAX\n" "while marking %s", ptr->dev, bucket_nr, b_gen, - *bucket_gen(ca, bucket_nr), bch2_data_types[bucket_data_type ?: ptr_data_type], bucket_sectors, sectors, (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)); |