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 cea583fa17 bcachefs: Only mark iterators nopreserve that aren't in use

Browse Source
This commit is contained in:
Kent Overstreet 2022-02-16 07:22:40 -05:00
parent 803d749d86
commit a1e928af83
2 changed files with 4 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 @@
a0d7001b0f35580ec941acc553cf5fe28d6efea9 cea583fa17b51f316f68ce46da1a380d7c28ce0c

6
libbcachefs/buckets.c
View File

@ -700,9 +700,10 @@ static int check_bucket_ref(struct bch_fs *c,
if (b_gen != ptr->gen && !ptr->cached) { if (b_gen != ptr->gen && !ptr->cached) {
bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, 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", "while marking %s",
ptr->dev, bucket_nr, b_gen, ptr->dev, bucket_nr, b_gen,
*bucket_gen(ca, bucket_nr),
bch2_data_types[bucket_data_type ?: ptr_data_type], bch2_data_types[bucket_data_type ?: ptr_data_type],
ptr->gen, ptr->gen,
(bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)); (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) { if ((unsigned) (bucket_sectors + sectors) > U16_MAX) {
bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, 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", "while marking %s",
ptr->dev, bucket_nr, b_gen, ptr->dev, bucket_nr, b_gen,
*bucket_gen(ca, bucket_nr),
bch2_data_types[bucket_data_type ?: ptr_data_type], bch2_data_types[bucket_data_type ?: ptr_data_type],
bucket_sectors, sectors, bucket_sectors, sectors,
(bch2_bkey_val_to_text(&PBUF(buf), c, k), buf)); (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf));