From 67c9b378c7e7820b91033004b032e236a8069b4a Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Mon, 3 Feb 2025 15:31:55 -0500
Subject: [PATCH] fixup! Update bcachefs sources to 63bbe0ca4167 bcachefs:
Scrub
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
c_src/cmd_fusemount.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/c_src/cmd_fusemount.c b/c_src/cmd_fusemount.c
index e5674b42..158f748d 100644
--- a/c_src/cmd_fusemount.c
+++ b/c_src/cmd_fusemount.c
@@ -31,9 +31,6 @@
#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 */
struct write_aligned_op_t {
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_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);