alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-12 00:00:12 +03:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Update bcachefs sources to 2f94f2e080a9 bcachefs: Fix restart handling in backpointers upgrade path
Some checks failed
build / bcachefs-tools-msrv (push) Has been cancelled
Details
.deb build orchestrator / publish (push) Has been cancelled
Details
.deb build orchestrator / source-only (push) Has been cancelled
Details
.deb build orchestrator / obs (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:ubuntu version:plucky], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:ubuntu version:plucky], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:ubuntu version:questing], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
Details
.deb build orchestrator / buildd (map[name:ubuntu version:questing], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
Details
.deb build orchestrator / reprotest (push) Has been cancelled
Details
Nix Flake actions / nix-matrix (push) Has been cancelled
Details
Nix Flake actions / ${{ matrix.name }} (${{ matrix.system }}) (push) Has been cancelled
Details

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-12-07 21:15:34 -05:00
parent dff2ff2456
commit 968eb2eb0c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
b37f516295b676928523c707dc4559b9b7a4169e 2f94f2e080a961cd6401d4bea5c31ff03516d30e

13
libbcachefs/alloc/backpointers.c
View File

@ -872,7 +872,8 @@ static int check_bucket_backpointer_mismatch(struct btree_trans *trans, struct b
if (nr_deletes > 256) if (nr_deletes > 256)
return bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc) ?: return bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc) ?:
bch2_btree_write_buffer_flush_sync(trans); bch2_btree_write_buffer_flush_sync(trans) ?:
bch_err_throw(c, transaction_restart_write_buffer_flush);
need_commit = true; need_commit = true;
continue; continue;
@ -949,12 +950,10 @@ static int check_bucket_backpointer_mismatch(struct btree_trans *trans, struct b
sectors[ALLOC_stripe] + sectors[ALLOC_stripe] +
sectors[ALLOC_cached]) == 0; sectors[ALLOC_cached]) == 0;
ret = bch2_bucket_bitmap_set(ca, &ca->bucket_backpointer_mismatch, try(bch2_bucket_bitmap_set(ca, &ca->bucket_backpointer_mismatch, alloc_k.k->p.offset));
alloc_k.k->p.offset) ?:
(empty if (empty)
? bch2_bucket_bitmap_set(ca, &ca->bucket_backpointer_empty, try(bch2_bucket_bitmap_set(ca, &ca->bucket_backpointer_empty, alloc_k.k->p.offset));
alloc_k.k->p.offset)
: 0);
*had_mismatch = true; *had_mismatch = true;
} }