fixup! Update bcachefs sources to 63bbe0ca4167 bcachefs: Scrub
Some checks failed
build / bcachefs-tools-deb (ubuntu-22.04) (push) Has been cancelled
build / bcachefs-tools-deb (ubuntu-24.04) (push) Has been cancelled
build / bcachefs-tools-rpm (push) Has been cancelled
build / bcachefs-tools-msrv (push) Has been cancelled
Nix-Tests / nix-flake-check (push) Has been cancelled

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-02-03 15:31:55 -05:00
parent 55afc8ad37
commit 67c9b378c7

View File

@ -31,9 +31,6 @@
#include <linux/dcache.h> #include <linux/dcache.h>
/* XXX cut and pasted from fsck.c */
#define QSTR(n) { { { .len = strlen(n) } }, .name = n }
/* used by write_aligned function for waiting on bch2_write closure */ /* used by write_aligned function for waiting on bch2_write closure */
struct write_aligned_op_t { struct write_aligned_op_t {
struct closure cl; struct closure cl;
@ -478,10 +475,9 @@ static int read_aligned(struct bch_fs *c, subvol_inum inum, size_t aligned_size,
closure_init_stack(&cl); closure_init_stack(&cl);
closure_get(&cl); closure_get(&cl);
rbio.bio.bi_end_io = bcachefs_fuse_read_endio; rbio.bio.bi_private = &cl;
rbio.bio.bi_private = &cl;
bch2_read(c, rbio_init(&rbio.bio, io_opts), inum); bch2_read(c, rbio_init(&rbio.bio, c, io_opts, bcachefs_fuse_read_endio), inum);
closure_sync(&cl); closure_sync(&cl);