470 files changed, 52 insertions, 121 deletions

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 08a68274..0d134b5e 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -78,7 +78,7 @@ jobs:
               uuid-dev zlib1g-dev valgrind libudev-dev python3-docutils libclang-dev
       - name: Extract MSRV
         run: |
-          MSRV=$(cargo metadata --format-version 1 --no-deps --manifest-path rust-src/Cargo.toml |
+          MSRV=$(cargo metadata --format-version 1 --no-deps |
                   jq -r '.packages[] | select(.name == "bcachefs-tools") | .rust_version')
           echo "MSRV=$MSRV" >> $GITHUB_ENV
       - name: Install Rust ${{ env.MSRV }} toolchain
diff --git a/.gitignore b/.gitignore
index efd7dc7c..cf86eab0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,13 @@ tests/__pycache__/
 !.editorconfig
 
 bcachefs-principles-of-operation.*
+
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
diff --git a/rust-src/Cargo.lock b/Cargo.lock
index 3e7eea92..3e7eea92 100644
--- a/rust-src/Cargo.lock
+++ b/Cargo.lock
diff --git a/rust-src/Cargo.toml b/Cargo.toml
index 66d7bc6a..66d7bc6a 100644
--- a/rust-src/Cargo.toml
+++ b/Cargo.toml
diff --git a/Makefile b/Makefile
index d283c7b4..4b4762ae 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC			\
 	-Wno-deprecated-declarations				\
 	-fno-strict-aliasing					\
 	-fno-delete-null-pointer-checks				\
-	-I. -Iinclude -Iraid					\
+	-Ic_src -Ic_src/include					\
 	-D_FILE_OFFSET_BITS=64					\
 	-D_GNU_SOURCE						\
 	-D_LGPL_SOURCE						\
@@ -55,12 +55,11 @@ CARGO_ARGS=${CARGO_TOOLCHAIN}
 CARGO=cargo $(CARGO_ARGS)
 CARGO_PROFILE=release
 # CARGO_PROFILE=debug
-CARGO_MANIFEST=--manifest-path rust-src/Cargo.toml
 
 CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
-CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) $(CARGO_MANIFEST)
+CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
 
-CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS) $(CARGO_MANIFEST)
+CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS)
 
 include Makefile.compiler
 
@@ -172,13 +171,13 @@ OBJS:=$(SRCS:.c=.o)
 	@echo "    [CC]     $@"
 	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-BCACHEFS_DEPS=libbcachefs.a
-RUST_SRCS:=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs')
+BCACHEFS_DEPS=c_src/libbcachefs.a
+RUST_SRCS:=$(shell find src bch_bindgen/src -type f -iname '*.rs')
 
 bcachefs: $(BCACHEFS_DEPS) $(RUST_SRCS)
-	$(CARGO_BUILD)
+	$(Q)$(CARGO_BUILD)
 
-libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
+c_src/libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
 	@echo "    [AR]     $@"
 	$(Q)ar -rc $@ $+
 
@@ -201,7 +200,7 @@ cmd_version.o : .version
 install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
 install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
 install: bcachefs $(optional_install)
-	$(INSTALL) -m0755 -D rust-src/target/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
+	$(INSTALL) -m0755 -D target/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
 	$(INSTALL) -m0644 -D bcachefs.8    -t $(DESTDIR)$(PREFIX)/share/man/man8/
 	$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
 	$(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
@@ -224,7 +223,7 @@ install_systemd: $(systemd_services) $(systemd_libexecfiles)
 .PHONY: clean
 clean:
 	@echo "Cleaning all"
-	$(Q)$(RM) libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
+	$(Q)$(RM) c_src/libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
 	$(Q)$(CARGO_CLEAN)
 	$(Q)$(RM) -f $(built_scripts)
 
@@ -244,8 +243,8 @@ doc: bcachefs-principles-of-operation.pdf
 
 .PHONY: cargo-update-msrv
 cargo-update-msrv:
-	cargo +nightly generate-lockfile --manifest-path rust-src/Cargo.toml -Zmsrv-policy
-	cargo +nightly generate-lockfile --manifest-path rust-src/bch_bindgen/Cargo.toml -Zmsrv-policy
+	cargo +nightly generate-lockfile -Zmsrv-policy
+	cargo +nightly generate-lockfile --manifest-path bch_bindgen/Cargo.toml -Zmsrv-policy
 
 .PHONY: update-bcachefs-sources
 update-bcachefs-sources:
diff --git a/rust-src/bch_bindgen/.gitignore b/bch_bindgen/.gitignore
index 0aa133ac..0aa133ac 100644
--- a/rust-src/bch_bindgen/.gitignore
+++ b/bch_bindgen/.gitignore
diff --git a/rust-src/bch_bindgen/Cargo.lock b/bch_bindgen/Cargo.lock
index 521c77c2..521c77c2 100644
--- a/rust-src/bch_bindgen/Cargo.lock
+++ b/bch_bindgen/Cargo.lock
diff --git a/rust-src/bch_bindgen/Cargo.toml b/bch_bindgen/Cargo.toml
index 33090ae9..33090ae9 100644
--- a/rust-src/bch_bindgen/Cargo.toml
+++ b/bch_bindgen/Cargo.toml
diff --git a/rust-src/bch_bindgen/build.rs b/bch_bindgen/build.rs
index d9805a8d..facea217 100644
--- a/rust-src/bch_bindgen/build.rs
+++ b/bch_bindgen/build.rs
@@ -19,9 +19,8 @@ fn main() {
         .expect("ENV Var 'CARGO_MANIFEST_DIR' Expected")
         .into();
 
-    let libbcachefs_inc_dir = std::path::Path::new("../..");
+    let libbcachefs_inc_dir = std::path::Path::new("../c_src");
 
-    let _libbcachefs_dir = top_dir.join("libbcachefs").join("libbcachefs");
     let bindings = bindgen::builder()
         .header(
             top_dir
diff --git a/rust-src/bch_bindgen/rustfmt.toml b/bch_bindgen/rustfmt.toml
index 42f2ad7c..42f2ad7c 100644
--- a/rust-src/bch_bindgen/rustfmt.toml
+++ b/bch_bindgen/rustfmt.toml
diff --git a/rust-src/bch_bindgen/src/bcachefs.rs b/bch_bindgen/src/bcachefs.rs
index 8e897c08..8e897c08 100644
--- a/rust-src/bch_bindgen/src/bcachefs.rs
+++ b/bch_bindgen/src/bcachefs.rs
diff --git a/rust-src/bch_bindgen/src/bkey.rs b/bch_bindgen/src/bkey.rs
index d4830839..d4830839 100644
--- a/rust-src/bch_bindgen/src/bkey.rs
+++ b/bch_bindgen/src/bkey.rs
diff --git a/rust-src/bch_bindgen/src/btree.rs b/bch_bindgen/src/btree.rs
index 09e86b34..09e86b34 100644
--- a/rust-src/bch_bindgen/src/btree.rs
+++ b/bch_bindgen/src/btree.rs
diff --git a/rust-src/bch_bindgen/src/errcode.rs b/bch_bindgen/src/errcode.rs
index 4d75f1d2..4d75f1d2 100644
--- a/rust-src/bch_bindgen/src/errcode.rs
+++ b/bch_bindgen/src/errcode.rs
diff --git a/rust-src/bch_bindgen/src/fs.rs b/bch_bindgen/src/fs.rs
index b26c51b6..b26c51b6 100644
--- a/rust-src/bch_bindgen/src/fs.rs
+++ b/bch_bindgen/src/fs.rs
diff --git a/rust-src/bch_bindgen/src/keyutils.rs b/bch_bindgen/src/keyutils.rs
index 30fc56f9..30fc56f9 100644
--- a/rust-src/bch_bindgen/src/keyutils.rs
+++ b/bch_bindgen/src/keyutils.rs
diff --git a/rust-src/bch_bindgen/src/keyutils_wrapper.h b/bch_bindgen/src/keyutils_wrapper.h
index 857cee2e..857cee2e 100644
--- a/rust-src/bch_bindgen/src/keyutils_wrapper.h
+++ b/bch_bindgen/src/keyutils_wrapper.h
diff --git a/rust-src/bch_bindgen/src/lib.rs b/bch_bindgen/src/lib.rs
index 4c549442..4c549442 100644
--- a/rust-src/bch_bindgen/src/lib.rs
+++ b/bch_bindgen/src/lib.rs
diff --git a/bch_bindgen/src/libbcachefs_wrapper.h b/bch_bindgen/src/libbcachefs_wrapper.h
new file mode 100644
index 00000000..141b0835
--- /dev/null
+++ b/bch_bindgen/src/libbcachefs_wrapper.h
@@ -0,0 +1,22 @@
+#include "libbcachefs/super-io.h"
+#include "libbcachefs/checksum.h"
+#include "libbcachefs/bcachefs_format.h"
+#include "libbcachefs/btree_cache.h"
+#include "libbcachefs/btree_iter.h"
+#include "libbcachefs/debug.h"
+#include "libbcachefs/errcode.h"
+#include "libbcachefs/error.h"
+#include "libbcachefs/opts.h"
+#include "libbcachefs.h"
+#include "crypto.h"
+#include "include/linux/bio.h"
+#include "include/linux/blkdev.h"
+#include "cmds.h"
+#include "raid/raid.h"
+
+
+#define MARK_FIX_753(req_name) const blk_mode_t Fix753_##req_name = req_name;
+
+MARK_FIX_753(BLK_OPEN_READ);
+MARK_FIX_753(BLK_OPEN_WRITE);
+MARK_FIX_753(BLK_OPEN_EXCL);
diff --git a/rust-src/bch_bindgen/src/opts.rs b/bch_bindgen/src/opts.rs
index d38d469c..d38d469c 100644
--- a/rust-src/bch_bindgen/src/opts.rs
+++ b/bch_bindgen/src/opts.rs
diff --git a/rust-src/bch_bindgen/src/rs.rs b/bch_bindgen/src/rs.rs
index 24594ae1..24594ae1 100644
--- a/rust-src/bch_bindgen/src/rs.rs
+++ b/bch_bindgen/src/rs.rs
diff --git a/build.nix b/build.nix
index 831c7e9f..a37a6c6e 100644
--- a/build.nix
+++ b/build.nix
@@ -35,12 +35,12 @@ in stdenv.mkDerivation {
 
   BCACHEFS_FUSE = if fuseSupport then "1" else "";
 
-  cargoRoot = "rust-src";
+  cargoRoot = ".";
   # when git-based crates are updated, run:
   # nix run github:Mic92/nix-update -- --version=skip --flake default
   # to update the hashes
   cargoDeps = rustPlatform.importCargoLock {
-    lockFile = "${src}/rust-src/Cargo.lock";
+    lockFile = "${src}/Cargo.lock";
     outputHashes = {
       "bindgen-0.64.0" = "sha256-GNG8as33HLRYJGYe0nw6qBzq86aHiGonyynEM7gaEE4=";
     };
diff --git a/rust-src/build.rs b/build.rs
index e4662bd7..3364c6ab 100644
--- a/rust-src/build.rs
+++ b/build.rs
@@ -1,6 +1,6 @@
 fn main() {
-    println!("cargo:rustc-link-search=..");
-    println!("cargo:rerun-if-changed=../libbcachefs.a");
+    println!("cargo:rustc-link-search=c_src");
+    println!("cargo:rerun-if-changed=c_src/libbcachefs.a");
     println!("cargo:rustc-link-lib=static:+whole-archive=bcachefs");
 
     println!("cargo:rustc-link-lib=urcu");
diff --git a/bcachefs.c b/c_src/bcachefs.c
index 70af2c39..70af2c39 100644
--- a/bcachefs.c
+++ b/c_src/bcachefs.c
diff --git a/ccan/array_size/LICENSE b/c_src/ccan/array_size/LICENSE
index feb9b118..feb9b118 100644
--- a/ccan/array_size/LICENSE
+++ b/c_src/ccan/array_size/LICENSE
diff --git a/ccan/array_size/_info b/c_src/ccan/array_size/_info
index 69570f34..69570f34 100644
--- a/ccan/array_size/_info
+++ b/c_src/ccan/array_size/_info
diff --git a/ccan/array_size/array_size.h b/c_src/ccan/array_size/array_size.h
index 0ca422a2..0ca422a2 100644
--- a/ccan/array_size/array_size.h
+++ b/c_src/ccan/array_size/array_size.h
diff --git a/ccan/build_assert/LICENSE b/c_src/ccan/build_assert/LICENSE
index feb9b118..feb9b118 100644
--- a/ccan/build_assert/LICENSE
+++ b/c_src/ccan/build_assert/LICENSE
diff --git a/ccan/build_assert/_info b/c_src/ccan/build_assert/_info
index 97ebe6c9..97ebe6c9 100644
--- a/ccan/build_assert/_info
+++ b/c_src/ccan/build_assert/_info
diff --git a/ccan/build_assert/build_assert.h b/c_src/ccan/build_assert/build_assert.h
index b9ecd840..b9ecd840 100644
--- a/ccan/build_assert/build_assert.h
+++ b/c_src/ccan/build_assert/build_assert.h
diff --git a/ccan/compiler/LICENSE b/c_src/ccan/compiler/LICENSE
index feb9b118..feb9b118 100644
--- a/ccan/compiler/LICENSE
+++ b/c_src/ccan/compiler/LICENSE
diff --git a/ccan/compiler/_info b/c_src/ccan/compiler/_info
index d60dff4d..d60dff4d 100644
--- a/ccan/compiler/_info
+++ b/c_src/ccan/compiler/_info
diff --git a/ccan/compiler/compiler.h b/c_src/ccan/compiler/compiler.h
index bce4f25a..bce4f25a 100644
--- a/ccan/compiler/compiler.h
+++ b/c_src/ccan/compiler/compiler.h
diff --git a/cmd_assemble.c b/c_src/cmd_assemble.c
index a997e1e1..a997e1e1 100644
--- a/cmd_assemble.c
+++ b/c_src/cmd_assemble.c
diff --git a/cmd_attr.c b/c_src/cmd_attr.c
index bde9d8f6..bde9d8f6 100644
--- a/cmd_attr.c
+++ b/c_src/cmd_attr.c
diff --git a/cmd_counters.c b/c_src/cmd_counters.c
index 9adde242..9adde242 100644
--- a/cmd_counters.c
+++ b/c_src/cmd_counters.c
diff --git a/cmd_data.c b/c_src/cmd_data.c
index 1ef689bc..1ef689bc 100644
--- a/cmd_data.c
+++ b/c_src/cmd_data.c
diff --git a/cmd_device.c b/c_src/cmd_device.c
index b4bcd345..b4bcd345 100644
--- a/cmd_device.c
+++ b/c_src/cmd_device.c
diff --git a/cmd_dump.c b/c_src/cmd_dump.c
index 51cc876b..51cc876b 100644
--- a/cmd_dump.c
+++ b/c_src/cmd_dump.c
diff --git a/cmd_format.c b/c_src/cmd_format.c
index 45c44e32..45c44e32 100644
--- a/cmd_format.c
+++ b/c_src/cmd_format.c
diff --git a/cmd_fs.c b/c_src/cmd_fs.c
index 67c38af6..67c38af6 100644
--- a/cmd_fs.c
+++ b/c_src/cmd_fs.c
diff --git a/cmd_fsck.c b/c_src/cmd_fsck.c
index 262ac1bc..262ac1bc 100644
--- a/cmd_fsck.c
+++ b/c_src/cmd_fsck.c
diff --git a/cmd_fusemount.c b/c_src/cmd_fusemount.c
index d81f3188..d81f3188 100644
--- a/cmd_fusemount.c
+++ b/c_src/cmd_fusemount.c
diff --git a/cmd_key.c b/c_src/cmd_key.c
index 96206c4c..96206c4c 100644
--- a/cmd_key.c
+++ b/c_src/cmd_key.c
diff --git a/cmd_kill_btree_node.c b/c_src/cmd_kill_btree_node.c
index b0832843..b0832843 100644
--- a/cmd_kill_btree_node.c
+++ b/c_src/cmd_kill_btree_node.c
diff --git a/cmd_list_journal.c b/c_src/cmd_list_journal.c
index 279afa79..279afa79 100644
--- a/cmd_list_journal.c
+++ b/c_src/cmd_list_journal.c
diff --git a/cmd_migrate.c b/c_src/cmd_migrate.c
index ea32e4ee..ea32e4ee 100644
--- a/cmd_migrate.c
+++ b/c_src/cmd_migrate.c
diff --git a/cmd_option.c b/c_src/cmd_option.c
index 6ce34016..6ce34016 100644
--- a/cmd_option.c
+++ b/c_src/cmd_option.c
diff --git a/cmd_run.c b/c_src/cmd_run.c
index 1bf84e5c..1bf84e5c 100644
--- a/cmd_run.c
+++ b/c_src/cmd_run.c
diff --git a/cmd_subvolume.c b/c_src/cmd_subvolume.c
index 99a302b8..99a302b8 100644
--- a/cmd_subvolume.c
+++ b/c_src/cmd_subvolume.c
diff --git a/cmd_version.c b/c_src/cmd_version.c
index 5fe30e5e..5fe30e5e 100644
--- a/cmd_version.c
+++ b/c_src/cmd_version.c
diff --git a/cmds.h b/c_src/cmds.h
index 64267dc4..64267dc4 100644
--- a/cmds.h
+++ b/c_src/cmds.h
diff --git a/config.h b/c_src/config.h
index e69de29b..e69de29b 100644
--- a/config.h
+++ b/c_src/config.h
diff --git a/crypto.c b/c_src/crypto.c
index 32671bd8..32671bd8 100644
--- a/crypto.c
+++ b/c_src/crypto.c
diff --git a/crypto.h b/c_src/crypto.h
index baea6d86..baea6d86 100644
--- a/crypto.h
+++ b/c_src/crypto.h
diff --git a/include/asm/page.h b/c_src/include/asm/page.h
index e69de29b..e69de29b 100644
--- a/include/asm/page.h
+++ b/c_src/include/asm/page.h
diff --git a/include/asm/unaligned.h b/c_src/include/asm/unaligned.h
index e695bede..e695bede 100644
--- a/include/asm/unaligned.h
+++ b/c_src/include/asm/unaligned.h
diff --git a/include/crypto/algapi.h b/c_src/include/crypto/algapi.h
index 5fd3524a..5fd3524a 100644
--- a/include/crypto/algapi.h
+++ b/c_src/include/crypto/algapi.h
diff --git a/include/crypto/chacha.h b/c_src/include/crypto/chacha.h
index f004cfb5..f004cfb5 100644
--- a/include/crypto/chacha.h
+++ b/c_src/include/crypto/chacha.h
diff --git a/include/crypto/hash.h b/c_src/include/crypto/hash.h
index a74f3618..a74f3618 100644
--- a/include/crypto/hash.h
+++ b/c_src/include/crypto/hash.h
diff --git a/include/crypto/poly1305.h b/c_src/include/crypto/poly1305.h
index 9fcfbfeb..9fcfbfeb 100644
--- a/include/crypto/poly1305.h
+++ b/c_src/include/crypto/poly1305.h
diff --git a/include/crypto/sha2.h b/c_src/include/crypto/sha2.h
index 8a46202b..8a46202b 100644
--- a/include/crypto/sha2.h
+++ b/c_src/include/crypto/sha2.h
diff --git a/include/crypto/skcipher.h b/c_src/include/crypto/skcipher.h
index 5989855d..5989855d 100644
--- a/include/crypto/skcipher.h
+++ b/c_src/include/crypto/skcipher.h
diff --git a/include/keys/user-type.h b/c_src/include/keys/user-type.h
index a7a2ee45..a7a2ee45 100644
--- a/include/keys/user-type.h
+++ b/c_src/include/keys/user-type.h
diff --git a/include/linux/atomic.h b/c_src/include/linux/atomic.h
index 5313f850..5313f850 100644
--- a/include/linux/atomic.h
+++ b/c_src/include/linux/atomic.h
diff --git a/include/linux/backing-dev-defs.h b/c_src/include/linux/backing-dev-defs.h
index e69de29b..e69de29b 100644
--- a/include/linux/backing-dev-defs.h
+++ b/c_src/include/linux/backing-dev-defs.h
diff --git a/include/linux/backing-dev.h b/c_src/include/linux/backing-dev.h
index d8a86b45..d8a86b45 100644
--- a/include/linux/backing-dev.h
+++ b/c_src/include/linux/backing-dev.h
diff --git a/include/linux/bio.h b/c_src/include/linux/bio.h
index 1f8acca2..1f8acca2 100644
--- a/include/linux/bio.h
+++ b/c_src/include/linux/bio.h
diff --git a/include/linux/bit_spinlock.h b/c_src/include/linux/bit_spinlock.h
index 873f08c2..873f08c2 100644
--- a/include/linux/bit_spinlock.h
+++ b/c_src/include/linux/bit_spinlock.h
diff --git a/include/linux/bitmap.h b/c_src/include/linux/bitmap.h
index db2dfdb2..db2dfdb2 100644
--- a/include/linux/bitmap.h
+++ b/c_src/include/linux/bitmap.h
diff --git a/include/linux/bitops.h b/c_src/include/linux/bitops.h
index 758476b1..758476b1 100644
--- a/include/linux/bitops.h
+++ b/c_src/include/linux/bitops.h
diff --git a/include/linux/blk_types.h b/c_src/include/linux/blk_types.h
index 80560ab6..80560ab6 100644
--- a/include/linux/blk_types.h
+++ b/c_src/include/linux/blk_types.h
diff --git a/include/linux/blkdev.h b/c_src/include/linux/blkdev.h
index 39143117..39143117 100644
--- a/include/linux/blkdev.h
+++ b/c_src/include/linux/blkdev.h
diff --git a/include/linux/bsearch.h b/c_src/include/linux/bsearch.h
index e66b711d..e66b711d 100644
--- a/include/linux/bsearch.h
+++ b/c_src/include/linux/bsearch.h
diff --git a/include/linux/bug.h b/c_src/include/linux/bug.h
index 1a10f7e6..1a10f7e6 100644
--- a/include/linux/bug.h
+++ b/c_src/include/linux/bug.h
diff --git a/include/linux/bvec.h b/c_src/include/linux/bvec.h
index 5bc68b42..5bc68b42 100644
--- a/include/linux/bvec.h
+++ b/c_src/include/linux/bvec.h
diff --git a/include/linux/byteorder.h b/c_src/include/linux/byteorder.h
index 7b04f5bc..7b04f5bc 100644
--- a/include/linux/byteorder.h
+++ b/c_src/include/linux/byteorder.h
diff --git a/include/linux/cache.h b/c_src/include/linux/cache.h
index c61167ca..c61167ca 100644
--- a/include/linux/cache.h
+++ b/c_src/include/linux/cache.h
diff --git a/include/linux/closure.h b/c_src/include/linux/closure.h
index c554c6a0..c554c6a0 100644
--- a/include/linux/closure.h
+++ b/c_src/include/linux/closure.h
diff --git a/include/linux/compiler.h b/c_src/include/linux/compiler.h
index 3ecc3dd1..3ecc3dd1 100644
--- a/include/linux/compiler.h
+++ b/c_src/include/linux/compiler.h
diff --git a/include/linux/completion.h b/c_src/include/linux/completion.h
index d11a8dd0..d11a8dd0 100644
--- a/include/linux/completion.h
+++ b/c_src/include/linux/completion.h
diff --git a/include/linux/console.h b/c_src/include/linux/console.h
index d01aa9a2..d01aa9a2 100644
--- a/include/linux/console.h
+++ b/c_src/include/linux/console.h
diff --git a/include/linux/cpumask.h b/c_src/include/linux/cpumask.h
index bfab7ea7..bfab7ea7 100644
--- a/include/linux/cpumask.h
+++ b/c_src/include/linux/cpumask.h
diff --git a/include/linux/crc32c.h b/c_src/include/linux/crc32c.h
index 1ac74f7d..1ac74f7d 100644
--- a/include/linux/crc32c.h
+++ b/c_src/include/linux/crc32c.h
diff --git a/include/linux/crc64.h b/c_src/include/linux/crc64.h
index c756e65a..c756e65a 100644
--- a/include/linux/crc64.h
+++ b/c_src/include/linux/crc64.h
diff --git a/include/linux/crypto.h b/c_src/include/linux/crypto.h
index 866b4c5a..866b4c5a 100644
--- a/include/linux/crypto.h
+++ b/c_src/include/linux/crypto.h
diff --git a/include/linux/ctype.h b/c_src/include/linux/ctype.h
index 26b7de5a..26b7de5a 100644
--- a/include/linux/ctype.h
+++ b/c_src/include/linux/ctype.h
diff --git a/include/linux/dcache.h b/c_src/include/linux/dcache.h
index 7637854d..7637854d 100644
--- a/include/linux/dcache.h
+++ b/c_src/include/linux/dcache.h
diff --git a/include/linux/debugfs.h b/c_src/include/linux/debugfs.h
index 9a78cb16..9a78cb16 100644
--- a/include/linux/debugfs.h
+++ b/c_src/include/linux/debugfs.h
diff --git a/include/linux/device.h b/c_src/include/linux/device.h
index 2b2b8494..2b2b8494 100644
--- a/include/linux/device.h
+++ b/c_src/include/linux/device.h
diff --git a/include/linux/dynamic_fault.h b/c_src/include/linux/dynamic_fault.h
index dd215dcb..dd215dcb 100644
--- a/include/linux/dynamic_fault.h
+++ b/c_src/include/linux/dynamic_fault.h
diff --git a/include/linux/err.h b/c_src/include/linux/err.h
index e94bdff5..e94bdff5 100644
--- a/include/linux/err.h
+++ b/c_src/include/linux/err.h
diff --git a/include/linux/errname.h b/c_src/include/linux/errname.h
index 443d5040..443d5040 100644
--- a/include/linux/errname.h
+++ b/c_src/include/linux/errname.h
diff --git a/include/linux/export.h b/c_src/include/linux/export.h
index af9da968..af9da968 100644
--- a/include/linux/export.h
+++ b/c_src/include/linux/export.h
diff --git a/include/linux/freezer.h b/c_src/include/linux/freezer.h
index d90373f3..d90373f3 100644
--- a/include/linux/freezer.h
+++ b/c_src/include/linux/freezer.h
diff --git a/include/linux/generic-radix-tree.h b/c_src/include/linux/generic-radix-tree.h
index 84741316..84741316 100644
--- a/include/linux/generic-radix-tree.h
+++ b/c_src/include/linux/generic-radix-tree.h
diff --git a/include/linux/genhd.h b/c_src/include/linux/genhd.h
index e69de29b..e69de29b 100644
--- a/include/linux/genhd.h
+++ b/c_src/include/linux/genhd.h
diff --git a/include/linux/gfp.h b/c_src/include/linux/gfp.h
index 3830bc2f..3830bc2f 100644
--- a/include/linux/gfp.h
+++ b/c_src/include/linux/gfp.h
diff --git a/include/linux/hash.h b/c_src/include/linux/hash.h
index ad6fa21d..ad6fa21d 100644
--- a/include/linux/hash.h
+++ b/c_src/include/linux/hash.h
diff --git a/include/linux/idr.h b/c_src/include/linux/idr.h
index 6f928254..6f928254 100644
--- a/include/linux/idr.h
+++ b/c_src/include/linux/idr.h
diff --git a/include/linux/ioprio.h b/c_src/include/linux/ioprio.h
index 822c64a2..822c64a2 100644
--- a/include/linux/ioprio.h
+++ b/c_src/include/linux/ioprio.h
diff --git a/include/linux/jhash.h b/c_src/include/linux/jhash.h
index 348c6f47..348c6f47 100644
--- a/include/linux/jhash.h
+++ b/c_src/include/linux/jhash.h
diff --git a/include/linux/jiffies.h b/c_src/include/linux/jiffies.h
index d16ea76f..d16ea76f 100644
--- a/include/linux/jiffies.h
+++ b/c_src/include/linux/jiffies.h
diff --git a/include/linux/kernel.h b/c_src/include/linux/kernel.h
index ef0b1a7d..ef0b1a7d 100644
--- a/include/linux/kernel.h
+++ b/c_src/include/linux/kernel.h
diff --git a/include/linux/key.h b/c_src/include/linux/key.h
index cc6859a9..cc6859a9 100644
--- a/include/linux/key.h
+++ b/c_src/include/linux/key.h
diff --git a/include/linux/kmemleak.h b/c_src/include/linux/kmemleak.h
index 6a3cd1bf..6a3cd1bf 100644
--- a/include/linux/kmemleak.h
+++ b/c_src/include/linux/kmemleak.h
diff --git a/include/linux/kobject.h b/c_src/include/linux/kobject.h
index c33b2126..c33b2126 100644
--- a/include/linux/kobject.h
+++ b/c_src/include/linux/kobject.h
diff --git a/include/linux/kthread.h b/c_src/include/linux/kthread.h
index 3a8cf108..3a8cf108 100644
--- a/include/linux/kthread.h
+++ b/c_src/include/linux/kthread.h
diff --git a/include/linux/list.h b/c_src/include/linux/list.h
index d176d0d3..d176d0d3 100644
--- a/include/linux/list.h
+++ b/c_src/include/linux/list.h
diff --git a/include/linux/list_nulls.h b/c_src/include/linux/list_nulls.h
index fa6e8471..fa6e8471 100644
--- a/include/linux/list_nulls.h
+++ b/c_src/include/linux/list_nulls.h
diff --git a/include/linux/llist.h b/c_src/include/linux/llist.h
index 2e9c7215..2e9c7215 100644
--- a/include/linux/llist.h
+++ b/c_src/include/linux/llist.h
diff --git a/include/linux/lockdep.h b/c_src/include/linux/lockdep.h
index 3831ef2d..3831ef2d 100644
--- a/include/linux/lockdep.h
+++ b/c_src/include/linux/lockdep.h
diff --git a/include/linux/log2.h b/c_src/include/linux/log2.h
index f031ea12..f031ea12 100644
--- a/include/linux/log2.h
+++ b/c_src/include/linux/log2.h
diff --git a/include/linux/lz4.h b/c_src/include/linux/lz4.h
index f574964a..f574964a 100644
--- a/include/linux/lz4.h
+++ b/c_src/include/linux/lz4.h
diff --git a/include/linux/math.h b/c_src/include/linux/math.h
index 85c8c8aa..85c8c8aa 100644
--- a/include/linux/math.h
+++ b/c_src/include/linux/math.h
diff --git a/include/linux/math64.h b/c_src/include/linux/math64.h
index 5eb6f064..5eb6f064 100644
--- a/include/linux/math64.h
+++ b/c_src/include/linux/math64.h
diff --git a/include/linux/mempool.h b/c_src/include/linux/mempool.h
index 506da24d..506da24d 100644
--- a/include/linux/mempool.h
+++ b/c_src/include/linux/mempool.h
diff --git a/include/linux/minmax.h b/c_src/include/linux/minmax.h
index ddc15bf7..ddc15bf7 100644
--- a/include/linux/minmax.h
+++ b/c_src/include/linux/minmax.h
diff --git a/include/linux/mm.h b/c_src/include/linux/mm.h
index 744a14ce..744a14ce 100644
--- a/include/linux/mm.h
+++ b/c_src/include/linux/mm.h
diff --git a/include/linux/module.h b/c_src/include/linux/module.h
index 42d4e18a..42d4e18a 100644
--- a/include/linux/module.h
+++ b/c_src/include/linux/module.h
diff --git a/include/linux/mutex.h b/c_src/include/linux/mutex.h
index 801f06e1..801f06e1 100644
--- a/include/linux/mutex.h
+++ b/c_src/include/linux/mutex.h
diff --git a/include/linux/osq_lock.h b/c_src/include/linux/osq_lock.h
index bde9f0d2..bde9f0d2 100644
--- a/include/linux/osq_lock.h
+++ b/c_src/include/linux/osq_lock.h
diff --git a/include/linux/overflow.h b/c_src/include/linux/overflow.h
index ba30f77e..ba30f77e 100644
--- a/include/linux/overflow.h
+++ b/c_src/include/linux/overflow.h
diff --git a/include/linux/page.h b/c_src/include/linux/page.h
index 111e5e68..111e5e68 100644
--- a/include/linux/page.h
+++ b/c_src/include/linux/page.h
diff --git a/include/linux/percpu-refcount.h b/c_src/include/linux/percpu-refcount.h
index 06550564..06550564 100644
--- a/include/linux/percpu-refcount.h
+++ b/c_src/include/linux/percpu-refcount.h
diff --git a/include/linux/percpu-rwsem.h b/c_src/include/linux/percpu-rwsem.h
index 153251c0..153251c0 100644
--- a/include/linux/percpu-rwsem.h
+++ b/c_src/include/linux/percpu-rwsem.h
diff --git a/include/linux/percpu.h b/c_src/include/linux/percpu.h
index 740d8332..740d8332 100644
--- a/include/linux/percpu.h
+++ b/c_src/include/linux/percpu.h
diff --git a/include/linux/poison.h b/c_src/include/linux/poison.h
index 851a855d..851a855d 100644
--- a/include/linux/poison.h
+++ b/c_src/include/linux/poison.h
diff --git a/include/linux/posix_acl.h b/c_src/include/linux/posix_acl.h
index 1d21bfee..1d21bfee 100644
--- a/include/linux/posix_acl.h
+++ b/c_src/include/linux/posix_acl.h
diff --git a/include/linux/posix_acl_xattr.h b/c_src/include/linux/posix_acl_xattr.h
index a8dad160..a8dad160 100644
--- a/include/linux/posix_acl_xattr.h
+++ b/c_src/include/linux/posix_acl_xattr.h
diff --git a/include/linux/prandom.h b/c_src/include/linux/prandom.h
index 9aea22dc..9aea22dc 100644
--- a/include/linux/prandom.h
+++ b/c_src/include/linux/prandom.h
diff --git a/include/linux/preempt.h b/c_src/include/linux/preempt.h
index dbc7c24d..dbc7c24d 100644
--- a/include/linux/preempt.h
+++ b/c_src/include/linux/preempt.h
diff --git a/include/linux/prefetch.h b/c_src/include/linux/prefetch.h
index b14fbe93..b14fbe93 100644
--- a/include/linux/prefetch.h
+++ b/c_src/include/linux/prefetch.h
diff --git a/include/linux/pretty-printers.h b/c_src/include/linux/pretty-printers.h
index f39d8edf..f39d8edf 100644
--- a/include/linux/pretty-printers.h
+++ b/c_src/include/linux/pretty-printers.h
diff --git a/include/linux/printk.h b/c_src/include/linux/printk.h
index cdafb9af..cdafb9af 100644
--- a/include/linux/printk.h
+++ b/c_src/include/linux/printk.h
diff --git a/include/linux/random.h b/c_src/include/linux/random.h
index 3203d13c..3203d13c 100644
--- a/include/linux/random.h
+++ b/c_src/include/linux/random.h
diff --git a/include/linux/ratelimit.h b/c_src/include/linux/ratelimit.h
index 680181d2..680181d2 100644
--- a/include/linux/ratelimit.h
+++ b/c_src/include/linux/ratelimit.h
diff --git a/include/linux/rculist.h b/c_src/include/linux/rculist.h
index 81df4e13..81df4e13 100644
--- a/include/linux/rculist.h
+++ b/c_src/include/linux/rculist.h
diff --git a/include/linux/rcupdate.h b/c_src/include/linux/rcupdate.h
index f5260270..f5260270 100644
--- a/include/linux/rcupdate.h
+++ b/c_src/include/linux/rcupdate.h
diff --git a/include/linux/refcount.h b/c_src/include/linux/refcount.h
index ddeec986..ddeec986 100644
--- a/include/linux/refcount.h
+++ b/c_src/include/linux/refcount.h
diff --git a/include/linux/rhashtable-types.h b/c_src/include/linux/rhashtable-types.h
index 57467cbf..57467cbf 100644
--- a/include/linux/rhashtable-types.h
+++ b/c_src/include/linux/rhashtable-types.h
diff --git a/include/linux/rhashtable.h b/c_src/include/linux/rhashtable.h
index 1c6dbdc8..1c6dbdc8 100644
--- a/include/linux/rhashtable.h
+++ b/c_src/include/linux/rhashtable.h
diff --git a/include/linux/rwsem.h b/c_src/include/linux/rwsem.h
index f851d6a2..f851d6a2 100644
--- a/include/linux/rwsem.h
+++ b/c_src/include/linux/rwsem.h
diff --git a/include/linux/scatterlist.h b/c_src/include/linux/scatterlist.h
index 1e4395c5..1e4395c5 100644
--- a/include/linux/scatterlist.h
+++ b/c_src/include/linux/scatterlist.h
diff --git a/include/linux/sched.h b/c_src/include/linux/sched.h
index 7afb6d54..7afb6d54 100644
--- a/include/linux/sched.h
+++ b/c_src/include/linux/sched.h
diff --git a/include/linux/sched/clock.h b/c_src/include/linux/sched/clock.h
index e69de29b..e69de29b 100644
--- a/include/linux/sched/clock.h
+++ b/c_src/include/linux/sched/clock.h
diff --git a/include/linux/sched/cputime.h b/c_src/include/linux/sched/cputime.h
index a89c626f..a89c626f 100644
--- a/include/linux/sched/cputime.h
+++ b/c_src/include/linux/sched/cputime.h
diff --git a/include/linux/sched/debug.h b/c_src/include/linux/sched/debug.h
index e69de29b..e69de29b 100644
--- a/include/linux/sched/debug.h
+++ b/c_src/include/linux/sched/debug.h
diff --git a/include/linux/sched/mm.h b/c_src/include/linux/sched/mm.h
index 03feda7a..03feda7a 100644
--- a/include/linux/sched/mm.h
+++ b/c_src/include/linux/sched/mm.h
diff --git a/include/linux/sched/rt.h b/c_src/include/linux/sched/rt.h
index ef3040e4..ef3040e4 100644
--- a/include/linux/sched/rt.h
+++ b/c_src/include/linux/sched/rt.h
diff --git a/include/linux/sched/signal.h b/c_src/include/linux/sched/signal.h
index 20bdc050..20bdc050 100644
--- a/include/linux/sched/signal.h
+++ b/c_src/include/linux/sched/signal.h
diff --git a/include/linux/sched/task.h b/c_src/include/linux/sched/task.h
index e69de29b..e69de29b 100644
--- a/include/linux/sched/task.h
+++ b/c_src/include/linux/sched/task.h
diff --git a/include/linux/sched/task_stack.h b/c_src/include/linux/sched/task_stack.h
index e69de29b..e69de29b 100644
--- a/include/linux/sched/task_stack.h
+++ b/c_src/include/linux/sched/task_stack.h
diff --git a/include/linux/semaphore.h b/c_src/include/linux/semaphore.h
index 498e717a..498e717a 100644
--- a/include/linux/semaphore.h
+++ b/c_src/include/linux/semaphore.h
diff --git a/include/linux/seq_buf.h b/c_src/include/linux/seq_buf.h
index 8c9c0dd7..8c9c0dd7 100644
--- a/include/linux/seq_buf.h
+++ b/c_src/include/linux/seq_buf.h
diff --git a/include/linux/seq_file.h b/c_src/include/linux/seq_file.h
index b455ebca..b455ebca 100644
--- a/include/linux/seq_file.h
+++ b/c_src/include/linux/seq_file.h
diff --git a/include/linux/seqlock.h b/c_src/include/linux/seqlock.h
index 435420fe..435420fe 100644
--- a/include/linux/seqlock.h
+++ b/c_src/include/linux/seqlock.h
diff --git a/include/linux/shrinker.h b/c_src/include/linux/shrinker.h
index d0a84794..d0a84794 100644
--- a/include/linux/shrinker.h
+++ b/c_src/include/linux/shrinker.h
diff --git a/include/linux/siphash.h b/c_src/include/linux/siphash.h
index bf21591a..bf21591a 100644
--- a/include/linux/siphash.h
+++ b/c_src/include/linux/siphash.h
diff --git a/include/linux/slab.h b/c_src/include/linux/slab.h
index ca0c7934..ca0c7934 100644
--- a/include/linux/slab.h
+++ b/c_src/include/linux/slab.h
diff --git a/include/linux/sort.h b/c_src/include/linux/sort.h
index afea0445..afea0445 100644
--- a/include/linux/sort.h
+++ b/c_src/include/linux/sort.h
diff --git a/include/linux/spinlock.h b/c_src/include/linux/spinlock.h
index 6c4a623c..6c4a623c 100644
--- a/include/linux/spinlock.h
+++ b/c_src/include/linux/spinlock.h
diff --git a/include/linux/srcu.h b/c_src/include/linux/srcu.h
index 75823cf2..75823cf2 100644
--- a/include/linux/srcu.h
+++ b/c_src/include/linux/srcu.h
diff --git a/include/linux/stat.h b/c_src/include/linux/stat.h
index 1a30957b..1a30957b 100644
--- a/include/linux/stat.h
+++ b/c_src/include/linux/stat.h
diff --git a/include/linux/string.h b/c_src/include/linux/string.h
index 3ceda3a3..3ceda3a3 100644
--- a/include/linux/string.h
+++ b/c_src/include/linux/string.h
diff --git a/include/linux/string_helpers.h b/c_src/include/linux/string_helpers.h
index af587706..af587706 100644
--- a/include/linux/string_helpers.h
+++ b/c_src/include/linux/string_helpers.h
diff --git a/include/linux/sysfs.h b/c_src/include/linux/sysfs.h
index cb75d88b..cb75d88b 100644
--- a/include/linux/sysfs.h
+++ b/c_src/include/linux/sysfs.h
diff --git a/include/linux/time64.h b/c_src/include/linux/time64.h
index cd6cc1c1..cd6cc1c1 100644
--- a/include/linux/time64.h
+++ b/c_src/include/linux/time64.h
diff --git a/include/linux/timer.h b/c_src/include/linux/timer.h
index 9667acf9..9667acf9 100644
--- a/include/linux/timer.h
+++ b/c_src/include/linux/timer.h
diff --git a/include/linux/tracepoint.h b/c_src/include/linux/tracepoint.h
index 1686cb90..1686cb90 100644
--- a/include/linux/tracepoint.h
+++ b/c_src/include/linux/tracepoint.h
diff --git a/include/linux/typecheck.h b/c_src/include/linux/typecheck.h
index eb5b74a5..eb5b74a5 100644
--- a/include/linux/typecheck.h
+++ b/c_src/include/linux/typecheck.h
diff --git a/include/linux/types.h b/c_src/include/linux/types.h
index ce454e26..ce454e26 100644
--- a/include/linux/types.h
+++ b/c_src/include/linux/types.h
diff --git a/include/linux/unaligned/be_byteshift.h b/c_src/include/linux/unaligned/be_byteshift.h
index 9356b242..9356b242 100644
--- a/include/linux/unaligned/be_byteshift.h
+++ b/c_src/include/linux/unaligned/be_byteshift.h
diff --git a/include/linux/unaligned/be_struct.h b/c_src/include/linux/unaligned/be_struct.h
index 13241583..13241583 100644
--- a/include/linux/unaligned/be_struct.h
+++ b/c_src/include/linux/unaligned/be_struct.h
diff --git a/include/linux/unaligned/generic.h b/c_src/include/linux/unaligned/generic.h
index 02d97ff3..02d97ff3 100644
--- a/include/linux/unaligned/generic.h
+++ b/c_src/include/linux/unaligned/generic.h
diff --git a/include/linux/unaligned/le_byteshift.h b/c_src/include/linux/unaligned/le_byteshift.h
index be376fb7..be376fb7 100644
--- a/include/linux/unaligned/le_byteshift.h
+++ b/c_src/include/linux/unaligned/le_byteshift.h
diff --git a/include/linux/unaligned/le_struct.h b/c_src/include/linux/unaligned/le_struct.h
index 088c4572..088c4572 100644
--- a/include/linux/unaligned/le_struct.h
+++ b/c_src/include/linux/unaligned/le_struct.h
diff --git a/include/linux/unaligned/packed_struct.h b/c_src/include/linux/unaligned/packed_struct.h
index c0d817de..c0d817de 100644
--- a/include/linux/unaligned/packed_struct.h
+++ b/c_src/include/linux/unaligned/packed_struct.h
diff --git a/include/linux/uuid.h b/c_src/include/linux/uuid.h
index a9990902..a9990902 100644
--- a/include/linux/uuid.h
+++ b/c_src/include/linux/uuid.h
diff --git a/include/linux/vmalloc.h b/c_src/include/linux/vmalloc.h
index 55fffb59..55fffb59 100644
--- a/include/linux/vmalloc.h
+++ b/c_src/include/linux/vmalloc.h
diff --git a/include/linux/wait.h b/c_src/include/linux/wait.h
index 4b9cbf38..4b9cbf38 100644
--- a/include/linux/wait.h
+++ b/c_src/include/linux/wait.h
diff --git a/include/linux/workqueue.h b/c_src/include/linux/workqueue.h
index 1406c958..1406c958 100644
--- a/include/linux/workqueue.h
+++ b/c_src/include/linux/workqueue.h
diff --git a/include/linux/xattr.h b/c_src/include/linux/xattr.h
index dcdff6e8..dcdff6e8 100644
--- a/include/linux/xattr.h
+++ b/c_src/include/linux/xattr.h
diff --git a/include/linux/xxhash.h b/c_src/include/linux/xxhash.h
index df425114..df425114 100644
--- a/include/linux/xxhash.h
+++ b/c_src/include/linux/xxhash.h
diff --git a/include/linux/zlib.h b/c_src/include/linux/zlib.h
index 45cfbd87..45cfbd87 100644
--- a/include/linux/zlib.h
+++ b/c_src/include/linux/zlib.h
diff --git a/include/linux/zstd.h b/c_src/include/linux/zstd.h
index b0fa1eda..b0fa1eda 100644
--- a/include/linux/zstd.h
+++ b/c_src/include/linux/zstd.h
diff --git a/include/linux/zstd_errors.h b/c_src/include/linux/zstd_errors.h
index 58b6dd45..58b6dd45 100644
--- a/include/linux/zstd_errors.h
+++ b/c_src/include/linux/zstd_errors.h
diff --git a/include/trace/define_trace.h b/c_src/include/trace/define_trace.h
index e69de29b..e69de29b 100644
--- a/include/trace/define_trace.h
+++ b/c_src/include/trace/define_trace.h
diff --git a/include/trace/events/lock.h b/c_src/include/trace/events/lock.h
index 9ebd081e..9ebd081e 100644
--- a/include/trace/events/lock.h
+++ b/c_src/include/trace/events/lock.h
diff --git a/include/uapi/linux/xattr.h b/c_src/include/uapi/linux/xattr.h
index 1590c49c..1590c49c 100644
--- a/include/uapi/linux/xattr.h
+++ b/c_src/include/uapi/linux/xattr.h
diff --git a/libbcachefs.c b/c_src/libbcachefs.c
index ef4cc718..ef4cc718 100644
--- a/libbcachefs.c
+++ b/c_src/libbcachefs.c
diff --git a/libbcachefs.h b/c_src/libbcachefs.h
index b189a208..b189a208 100644
--- a/libbcachefs.h
+++ b/c_src/libbcachefs.h
diff --git a/libbcachefs/acl.c b/c_src/libbcachefs/acl.c
index 3640f417..3640f417 100644
--- a/libbcachefs/acl.c
+++ b/c_src/libbcachefs/acl.c
diff --git a/libbcachefs/acl.h b/c_src/libbcachefs/acl.h
index 27e7eec0..27e7eec0 100644
--- a/libbcachefs/acl.h
+++ b/c_src/libbcachefs/acl.h
diff --git a/libbcachefs/alloc_background.c b/c_src/libbcachefs/alloc_background.c
index a09b9d00..a09b9d00 100644
--- a/libbcachefs/alloc_background.c
+++ b/c_src/libbcachefs/alloc_background.c
diff --git a/libbcachefs/alloc_background.h b/c_src/libbcachefs/alloc_background.h
index e7f7e842..e7f7e842 100644
--- a/libbcachefs/alloc_background.h
+++ b/c_src/libbcachefs/alloc_background.h
diff --git a/libbcachefs/alloc_foreground.c b/c_src/libbcachefs/alloc_foreground.c
index b0ff4799..b0ff4799 100644
--- a/libbcachefs/alloc_foreground.c
+++ b/c_src/libbcachefs/alloc_foreground.c
diff --git a/libbcachefs/alloc_foreground.h b/c_src/libbcachefs/alloc_foreground.h
index 7aaeec44..7aaeec44 100644
--- a/libbcachefs/alloc_foreground.h
+++ b/c_src/libbcachefs/alloc_foreground.h
diff --git a/libbcachefs/alloc_types.h b/c_src/libbcachefs/alloc_types.h
index b91b7a46..b91b7a46 100644
--- a/libbcachefs/alloc_types.h
+++ b/c_src/libbcachefs/alloc_types.h
diff --git a/libbcachefs/backpointers.c b/c_src/libbcachefs/backpointers.c
index e358a2ff..e358a2ff 100644
--- a/libbcachefs/backpointers.c
+++ b/c_src/libbcachefs/backpointers.c
diff --git a/libbcachefs/backpointers.h b/c_src/libbcachefs/backpointers.h
index 737e2396..737e2396 100644
--- a/libbcachefs/backpointers.h
+++ b/c_src/libbcachefs/backpointers.h
diff --git a/libbcachefs/bbpos.h b/c_src/libbcachefs/bbpos.h
index be2edced..be2edced 100644
--- a/libbcachefs/bbpos.h
+++ b/c_src/libbcachefs/bbpos.h
diff --git a/libbcachefs/bbpos_types.h b/c_src/libbcachefs/bbpos_types.h
index 5198e94c..5198e94c 100644
--- a/libbcachefs/bbpos_types.h
+++ b/c_src/libbcachefs/bbpos_types.h
diff --git a/libbcachefs/bcachefs.h b/c_src/libbcachefs/bcachefs.h
index dac383e3..dac383e3 100644
--- a/libbcachefs/bcachefs.h
+++ b/c_src/libbcachefs/bcachefs.h
diff --git a/libbcachefs/bcachefs_format.h b/c_src/libbcachefs/bcachefs_format.h
index 0d5ac418..0d5ac418 100644
--- a/libbcachefs/bcachefs_format.h
+++ b/c_src/libbcachefs/bcachefs_format.h
diff --git a/libbcachefs/bcachefs_ioctl.h b/c_src/libbcachefs/bcachefs_ioctl.h
index 4b8fba75..4b8fba75 100644
--- a/libbcachefs/bcachefs_ioctl.h
+++ b/c_src/libbcachefs/bcachefs_ioctl.h
diff --git a/libbcachefs/bkey.c b/c_src/libbcachefs/bkey.c
index abdb0550..abdb0550 100644
--- a/libbcachefs/bkey.c
+++ b/c_src/libbcachefs/bkey.c
diff --git a/libbcachefs/bkey.h b/c_src/libbcachefs/bkey.h
index 831be018..831be018 100644
--- a/libbcachefs/bkey.h
+++ b/c_src/libbcachefs/bkey.h
diff --git a/libbcachefs/bkey_buf.h b/c_src/libbcachefs/bkey_buf.h
index a30c4ae8..a30c4ae8 100644
--- a/libbcachefs/bkey_buf.h
+++ b/c_src/libbcachefs/bkey_buf.h
diff --git a/libbcachefs/bkey_cmp.h b/c_src/libbcachefs/bkey_cmp.h
index 5f42a6e6..5f42a6e6 100644
--- a/libbcachefs/bkey_cmp.h
+++ b/c_src/libbcachefs/bkey_cmp.h
diff --git a/libbcachefs/bkey_methods.c b/c_src/libbcachefs/bkey_methods.c
index 761f5e33..761f5e33 100644
--- a/libbcachefs/bkey_methods.c
+++ b/c_src/libbcachefs/bkey_methods.c
diff --git a/libbcachefs/bkey_methods.h b/c_src/libbcachefs/bkey_methods.h
index ee822837..ee822837 100644
--- a/libbcachefs/bkey_methods.h
+++ b/c_src/libbcachefs/bkey_methods.h
diff --git a/libbcachefs/bkey_sort.c b/c_src/libbcachefs/bkey_sort.c
index bcca9e76..bcca9e76 100644
--- a/libbcachefs/bkey_sort.c
+++ b/c_src/libbcachefs/bkey_sort.c
diff --git a/libbcachefs/bkey_sort.h b/c_src/libbcachefs/bkey_sort.h
index 7c0f0b16..7c0f0b16 100644
--- a/libbcachefs/bkey_sort.h
+++ b/c_src/libbcachefs/bkey_sort.h
diff --git a/libbcachefs/bset.c b/c_src/libbcachefs/bset.c
index 74bf8eb9..74bf8eb9 100644
--- a/libbcachefs/bset.c
+++ b/c_src/libbcachefs/bset.c
diff --git a/libbcachefs/bset.h b/c_src/libbcachefs/bset.h
index 632c2b8c..632c2b8c 100644
--- a/libbcachefs/bset.h
+++ b/c_src/libbcachefs/bset.h
diff --git a/libbcachefs/btree_cache.c b/c_src/libbcachefs/btree_cache.c
index 8e2488a4..8e2488a4 100644
--- a/libbcachefs/btree_cache.c
+++ b/c_src/libbcachefs/btree_cache.c
diff --git a/libbcachefs/btree_cache.h b/c_src/libbcachefs/btree_cache.h
index 4e1af588..4e1af588 100644
--- a/libbcachefs/btree_cache.h
+++ b/c_src/libbcachefs/btree_cache.h
diff --git a/libbcachefs/btree_gc.c b/c_src/libbcachefs/btree_gc.c
index 49b4ade7..49b4ade7 100644
--- a/libbcachefs/btree_gc.c
+++ b/c_src/libbcachefs/btree_gc.c
diff --git a/libbcachefs/btree_gc.h b/c_src/libbcachefs/btree_gc.h
index 607575f8..607575f8 100644
--- a/libbcachefs/btree_gc.h
+++ b/c_src/libbcachefs/btree_gc.h
diff --git a/libbcachefs/btree_io.c b/c_src/libbcachefs/btree_io.c
index 33db48e2..33db48e2 100644
--- a/libbcachefs/btree_io.c
+++ b/c_src/libbcachefs/btree_io.c
diff --git a/libbcachefs/btree_io.h b/c_src/libbcachefs/btree_io.h
index e251cb6b..e251cb6b 100644
--- a/libbcachefs/btree_io.h
+++ b/c_src/libbcachefs/btree_io.h
diff --git a/libbcachefs/btree_iter.c b/c_src/libbcachefs/btree_iter.c
index fa298289..fa298289 100644
--- a/libbcachefs/btree_iter.c
+++ b/c_src/libbcachefs/btree_iter.c
diff --git a/libbcachefs/btree_iter.h b/c_src/libbcachefs/btree_iter.h
index da2b74fa..da2b74fa 100644
--- a/libbcachefs/btree_iter.h
+++ b/c_src/libbcachefs/btree_iter.h
diff --git a/libbcachefs/btree_journal_iter.c b/c_src/libbcachefs/btree_journal_iter.c
index 719a94a8..719a94a8 100644
--- a/libbcachefs/btree_journal_iter.c
+++ b/c_src/libbcachefs/btree_journal_iter.c
diff --git a/libbcachefs/btree_journal_iter.h b/c_src/libbcachefs/btree_journal_iter.h
index 8ca4c100..8ca4c100 100644
--- a/libbcachefs/btree_journal_iter.h
+++ b/c_src/libbcachefs/btree_journal_iter.h
diff --git a/libbcachefs/btree_key_cache.c b/c_src/libbcachefs/btree_key_cache.c
index 74e52fd2..74e52fd2 100644
--- a/libbcachefs/btree_key_cache.c
+++ b/c_src/libbcachefs/btree_key_cache.c
diff --git a/libbcachefs/btree_key_cache.h b/c_src/libbcachefs/btree_key_cache.h
index e6b2cd0d..e6b2cd0d 100644
--- a/libbcachefs/btree_key_cache.h
+++ b/c_src/libbcachefs/btree_key_cache.h
diff --git a/libbcachefs/btree_key_cache_types.h b/c_src/libbcachefs/btree_key_cache_types.h
index 290e4e57..290e4e57 100644
--- a/libbcachefs/btree_key_cache_types.h
+++ b/c_src/libbcachefs/btree_key_cache_types.h
diff --git a/libbcachefs/btree_locking.c b/c_src/libbcachefs/btree_locking.c
index 2d1c95c4..2d1c95c4 100644
--- a/libbcachefs/btree_locking.c
+++ b/c_src/libbcachefs/btree_locking.c
diff --git a/libbcachefs/btree_locking.h b/c_src/libbcachefs/btree_locking.h
index cc5500a9..cc5500a9 100644
--- a/libbcachefs/btree_locking.h
+++ b/c_src/libbcachefs/btree_locking.h
diff --git a/libbcachefs/btree_trans_commit.c b/c_src/libbcachefs/btree_trans_commit.c
index 80505554..80505554 100644
--- a/libbcachefs/btree_trans_commit.c
+++ b/c_src/libbcachefs/btree_trans_commit.c
diff --git a/libbcachefs/btree_types.h b/c_src/libbcachefs/btree_types.h
index d5303070..d5303070 100644
--- a/libbcachefs/btree_types.h
+++ b/c_src/libbcachefs/btree_types.h
diff --git a/libbcachefs/btree_update.c b/c_src/libbcachefs/btree_update.c
index c3ff365a..c3ff365a 100644
--- a/libbcachefs/btree_update.c
+++ b/c_src/libbcachefs/btree_update.c
diff --git a/libbcachefs/btree_update.h b/c_src/libbcachefs/btree_update.h
index b9382b7b..b9382b7b 100644
--- a/libbcachefs/btree_update.h
+++ b/c_src/libbcachefs/btree_update.h
diff --git a/libbcachefs/btree_update_interior.c b/c_src/libbcachefs/btree_update_interior.c
index 44f9dfa2..44f9dfa2 100644
--- a/libbcachefs/btree_update_interior.c
+++ b/c_src/libbcachefs/btree_update_interior.c
diff --git a/libbcachefs/btree_update_interior.h b/c_src/libbcachefs/btree_update_interior.h
index adfc6208..adfc6208 100644
--- a/libbcachefs/btree_update_interior.h
+++ b/c_src/libbcachefs/btree_update_interior.h
diff --git a/libbcachefs/btree_write_buffer.c b/c_src/libbcachefs/btree_write_buffer.c
index 5c1169c7..5c1169c7 100644
--- a/libbcachefs/btree_write_buffer.c
+++ b/c_src/libbcachefs/btree_write_buffer.c
diff --git a/libbcachefs/btree_write_buffer.h b/c_src/libbcachefs/btree_write_buffer.h
index eebcd2b1..eebcd2b1 100644
--- a/libbcachefs/btree_write_buffer.h
+++ b/c_src/libbcachefs/btree_write_buffer.h
diff --git a/libbcachefs/btree_write_buffer_types.h b/c_src/libbcachefs/btree_write_buffer_types.h
index 9b9433de..9b9433de 100644
--- a/libbcachefs/btree_write_buffer_types.h
+++ b/c_src/libbcachefs/btree_write_buffer_types.h
diff --git a/libbcachefs/buckets.c b/c_src/libbcachefs/buckets.c
index 67b7e796..67b7e796 100644
--- a/libbcachefs/buckets.c
+++ b/c_src/libbcachefs/buckets.c
diff --git a/libbcachefs/buckets.h b/c_src/libbcachefs/buckets.h
index 2c95cc5d..2c95cc5d 100644
--- a/libbcachefs/buckets.h
+++ b/c_src/libbcachefs/buckets.h
diff --git a/libbcachefs/buckets_types.h b/c_src/libbcachefs/buckets_types.h
index 783f7101..783f7101 100644
--- a/libbcachefs/buckets_types.h
+++ b/c_src/libbcachefs/buckets_types.h
diff --git a/libbcachefs/buckets_waiting_for_journal.c b/c_src/libbcachefs/buckets_waiting_for_journal.c
index ec1b636e..ec1b636e 100644
--- a/libbcachefs/buckets_waiting_for_journal.c
+++ b/c_src/libbcachefs/buckets_waiting_for_journal.c
diff --git a/libbcachefs/buckets_waiting_for_journal.h b/c_src/libbcachefs/buckets_waiting_for_journal.h
index d2ae19cb..d2ae19cb 100644
--- a/libbcachefs/buckets_waiting_for_journal.h
+++ b/c_src/libbcachefs/buckets_waiting_for_journal.h
diff --git a/libbcachefs/buckets_waiting_for_journal_types.h b/c_src/libbcachefs/buckets_waiting_for_journal_types.h
index e593db06..e593db06 100644
--- a/libbcachefs/buckets_waiting_for_journal_types.h
+++ b/c_src/libbcachefs/buckets_waiting_for_journal_types.h
diff --git a/libbcachefs/chardev.c b/c_src/libbcachefs/chardev.c
index 226b39c1..226b39c1 100644
--- a/libbcachefs/chardev.c
+++ b/c_src/libbcachefs/chardev.c
diff --git a/libbcachefs/chardev.h b/c_src/libbcachefs/chardev.h
index 0f563ca5..0f563ca5 100644
--- a/libbcachefs/chardev.h
+++ b/c_src/libbcachefs/chardev.h
diff --git a/libbcachefs/checksum.c b/c_src/libbcachefs/checksum.c
index 3c761ad6..3c761ad6 100644
--- a/libbcachefs/checksum.c
+++ b/c_src/libbcachefs/checksum.c
diff --git a/libbcachefs/checksum.h b/c_src/libbcachefs/checksum.h
index 1b8c2c10..1b8c2c10 100644
--- a/libbcachefs/checksum.h
+++ b/c_src/libbcachefs/checksum.h
diff --git a/libbcachefs/clock.c b/c_src/libbcachefs/clock.c
index f4188909..f4188909 100644
--- a/libbcachefs/clock.c
+++ b/c_src/libbcachefs/clock.c
diff --git a/libbcachefs/clock.h b/c_src/libbcachefs/clock.h
index 70a0f743..70a0f743 100644
--- a/libbcachefs/clock.h
+++ b/c_src/libbcachefs/clock.h
diff --git a/libbcachefs/clock_types.h b/c_src/libbcachefs/clock_types.h
index 5fae0012..5fae0012 100644
--- a/libbcachefs/clock_types.h
+++ b/c_src/libbcachefs/clock_types.h
diff --git a/libbcachefs/compress.c b/c_src/libbcachefs/compress.c
index 33df8cf8..33df8cf8 100644
--- a/libbcachefs/compress.c
+++ b/c_src/libbcachefs/compress.c
diff --git a/libbcachefs/compress.h b/c_src/libbcachefs/compress.h
index 607fd5e2..607fd5e2 100644
--- a/libbcachefs/compress.h
+++ b/c_src/libbcachefs/compress.h
diff --git a/libbcachefs/counters.c b/c_src/libbcachefs/counters.c
index 02a996e0..02a996e0 100644
--- a/libbcachefs/counters.c
+++ b/c_src/libbcachefs/counters.c
diff --git a/libbcachefs/counters.h b/c_src/libbcachefs/counters.h
index 4778aa19..4778aa19 100644
--- a/libbcachefs/counters.h
+++ b/c_src/libbcachefs/counters.h
diff --git a/libbcachefs/darray.c b/c_src/libbcachefs/darray.c
index ac35b8b7..ac35b8b7 100644
--- a/libbcachefs/darray.c
+++ b/c_src/libbcachefs/darray.c
diff --git a/libbcachefs/darray.h b/c_src/libbcachefs/darray.h
index 4b340d13..4b340d13 100644
--- a/libbcachefs/darray.h
+++ b/c_src/libbcachefs/darray.h
diff --git a/libbcachefs/data_update.c b/c_src/libbcachefs/data_update.c
index 6f13477f..6f13477f 100644
--- a/libbcachefs/data_update.c
+++ b/c_src/libbcachefs/data_update.c
diff --git a/libbcachefs/data_update.h b/c_src/libbcachefs/data_update.h
index 991095bb..991095bb 100644
--- a/libbcachefs/data_update.h
+++ b/c_src/libbcachefs/data_update.h
diff --git a/libbcachefs/debug.c b/c_src/libbcachefs/debug.c
index d6418948..d6418948 100644
--- a/libbcachefs/debug.c
+++ b/c_src/libbcachefs/debug.c
diff --git a/libbcachefs/debug.h b/c_src/libbcachefs/debug.h
index 2c37143b..2c37143b 100644
--- a/libbcachefs/debug.h
+++ b/c_src/libbcachefs/debug.h
diff --git a/libbcachefs/dirent.c b/c_src/libbcachefs/dirent.c
index 4ae1e9f0..4ae1e9f0 100644
--- a/libbcachefs/dirent.c
+++ b/c_src/libbcachefs/dirent.c
diff --git a/libbcachefs/dirent.h b/c_src/libbcachefs/dirent.h
index 21ffeb78..21ffeb78 100644
--- a/libbcachefs/dirent.h
+++ b/c_src/libbcachefs/dirent.h
diff --git a/libbcachefs/disk_groups.c b/c_src/libbcachefs/disk_groups.c
index 06a7df52..06a7df52 100644
--- a/libbcachefs/disk_groups.c
+++ b/c_src/libbcachefs/disk_groups.c
diff --git a/libbcachefs/disk_groups.h b/c_src/libbcachefs/disk_groups.h
index 441826ff..441826ff 100644
--- a/libbcachefs/disk_groups.h
+++ b/c_src/libbcachefs/disk_groups.h
diff --git a/libbcachefs/disk_groups_types.h b/c_src/libbcachefs/disk_groups_types.h
index a54ef085..a54ef085 100644
--- a/libbcachefs/disk_groups_types.h
+++ b/c_src/libbcachefs/disk_groups_types.h
diff --git a/libbcachefs/ec.c b/c_src/libbcachefs/ec.c
index d802bc63..d802bc63 100644
--- a/libbcachefs/ec.c
+++ b/c_src/libbcachefs/ec.c
diff --git a/libbcachefs/ec.h b/c_src/libbcachefs/ec.h
index f4369b02..f4369b02 100644
--- a/libbcachefs/ec.h
+++ b/c_src/libbcachefs/ec.h
diff --git a/libbcachefs/ec_types.h b/c_src/libbcachefs/ec_types.h
index 976426da..976426da 100644
--- a/libbcachefs/ec_types.h
+++ b/c_src/libbcachefs/ec_types.h
diff --git a/libbcachefs/errcode.c b/c_src/libbcachefs/errcode.c
index d260ff9b..d260ff9b 100644
--- a/libbcachefs/errcode.c
+++ b/c_src/libbcachefs/errcode.c
diff --git a/libbcachefs/errcode.h b/c_src/libbcachefs/errcode.h
index 8c40c206..8c40c206 100644
--- a/libbcachefs/errcode.h
+++ b/c_src/libbcachefs/errcode.h
diff --git a/libbcachefs/error.c b/c_src/libbcachefs/error.c
index d32c8beb..d32c8beb 100644
--- a/libbcachefs/error.c
+++ b/c_src/libbcachefs/error.c
diff --git a/libbcachefs/error.h b/c_src/libbcachefs/error.h
index fec17d13..fec17d13 100644
--- a/libbcachefs/error.h
+++ b/c_src/libbcachefs/error.h
diff --git a/libbcachefs/extent_update.c b/c_src/libbcachefs/extent_update.c
index b9033bb4..b9033bb4 100644
--- a/libbcachefs/extent_update.c
+++ b/c_src/libbcachefs/extent_update.c
diff --git a/libbcachefs/extent_update.h b/c_src/libbcachefs/extent_update.h
index 6f5cf449..6f5cf449 100644
--- a/libbcachefs/extent_update.h
+++ b/c_src/libbcachefs/extent_update.h
diff --git a/libbcachefs/extents.c b/c_src/libbcachefs/extents.c
index 82ec056f..82ec056f 100644
--- a/libbcachefs/extents.c
+++ b/c_src/libbcachefs/extents.c
diff --git a/libbcachefs/extents.h b/c_src/libbcachefs/extents.h
index a855c94d..a855c94d 100644
--- a/libbcachefs/extents.h
+++ b/c_src/libbcachefs/extents.h
diff --git a/libbcachefs/extents_types.h b/c_src/libbcachefs/extents_types.h
index 43d6c341..43d6c341 100644
--- a/libbcachefs/extents_types.h
+++ b/c_src/libbcachefs/extents_types.h
diff --git a/libbcachefs/eytzinger.h b/c_src/libbcachefs/eytzinger.h
index 05429c96..05429c96 100644
--- a/libbcachefs/eytzinger.h
+++ b/c_src/libbcachefs/eytzinger.h
diff --git a/libbcachefs/fifo.h b/c_src/libbcachefs/fifo.h
index 66b945be..66b945be 100644
--- a/libbcachefs/fifo.h
+++ b/c_src/libbcachefs/fifo.h
diff --git a/libbcachefs/fs-common.c b/c_src/libbcachefs/fs-common.c
index 1c1ea0f0..1c1ea0f0 100644
--- a/libbcachefs/fs-common.c
+++ b/c_src/libbcachefs/fs-common.c
diff --git a/libbcachefs/fs-common.h b/c_src/libbcachefs/fs-common.h
index dde23785..dde23785 100644
--- a/libbcachefs/fs-common.h
+++ b/c_src/libbcachefs/fs-common.h
diff --git a/libbcachefs/fs-io-buffered.c b/c_src/libbcachefs/fs-io-buffered.c
index 73c12e56..73c12e56 100644
--- a/libbcachefs/fs-io-buffered.c
+++ b/c_src/libbcachefs/fs-io-buffered.c
diff --git a/libbcachefs/fs-io-buffered.h b/c_src/libbcachefs/fs-io-buffered.h
index a6126ff7..a6126ff7 100644
--- a/libbcachefs/fs-io-buffered.h
+++ b/c_src/libbcachefs/fs-io-buffered.h
diff --git a/libbcachefs/fs-io-direct.c b/c_src/libbcachefs/fs-io-direct.c
index fdd57c57..fdd57c57 100644
--- a/libbcachefs/fs-io-direct.c
+++ b/c_src/libbcachefs/fs-io-direct.c
diff --git a/libbcachefs/fs-io-direct.h b/c_src/libbcachefs/fs-io-direct.h
index 814621ec..814621ec 100644
--- a/libbcachefs/fs-io-direct.h
+++ b/c_src/libbcachefs/fs-io-direct.h
diff --git a/libbcachefs/fs-io-pagecache.c b/c_src/libbcachefs/fs-io-pagecache.c
index ff664fd0..ff664fd0 100644
--- a/libbcachefs/fs-io-pagecache.c
+++ b/c_src/libbcachefs/fs-io-pagecache.c
diff --git a/libbcachefs/fs-io-pagecache.h b/c_src/libbcachefs/fs-io-pagecache.h
index 27f712ae..27f712ae 100644
--- a/libbcachefs/fs-io-pagecache.h
+++ b/c_src/libbcachefs/fs-io-pagecache.h
diff --git a/libbcachefs/fs-io.c b/c_src/libbcachefs/fs-io.c
index 98bd5bab..98bd5bab 100644
--- a/libbcachefs/fs-io.c
+++ b/c_src/libbcachefs/fs-io.c
diff --git a/libbcachefs/fs-io.h b/c_src/libbcachefs/fs-io.h
index ca70346e..ca70346e 100644
--- a/libbcachefs/fs-io.h
+++ b/c_src/libbcachefs/fs-io.h
diff --git a/libbcachefs/fs-ioctl.c b/c_src/libbcachefs/fs-ioctl.c
index e0a19a73..e0a19a73 100644
--- a/libbcachefs/fs-ioctl.c
+++ b/c_src/libbcachefs/fs-ioctl.c
diff --git a/libbcachefs/fs-ioctl.h b/c_src/libbcachefs/fs-ioctl.h
index d30f9bb0..d30f9bb0 100644
--- a/libbcachefs/fs-ioctl.h
+++ b/c_src/libbcachefs/fs-ioctl.h
diff --git a/libbcachefs/fs.c b/c_src/libbcachefs/fs.c
index da117576..da117576 100644
--- a/libbcachefs/fs.c
+++ b/c_src/libbcachefs/fs.c
diff --git a/libbcachefs/fs.h b/c_src/libbcachefs/fs.h
index c3af7225..c3af7225 100644
--- a/libbcachefs/fs.h
+++ b/c_src/libbcachefs/fs.h
diff --git a/libbcachefs/fsck.c b/c_src/libbcachefs/fsck.c
index 4f0ecd60..4f0ecd60 100644
--- a/libbcachefs/fsck.c
+++ b/c_src/libbcachefs/fsck.c
diff --git a/libbcachefs/fsck.h b/c_src/libbcachefs/fsck.h
index da991e8c..da991e8c 100644
--- a/libbcachefs/fsck.h
+++ b/c_src/libbcachefs/fsck.h
diff --git a/libbcachefs/inode.c b/c_src/libbcachefs/inode.c
index 37dce96f..37dce96f 100644
--- a/libbcachefs/inode.c
+++ b/c_src/libbcachefs/inode.c
diff --git a/libbcachefs/inode.h b/c_src/libbcachefs/inode.h
index b63f3125..b63f3125 100644
--- a/libbcachefs/inode.h
+++ b/c_src/libbcachefs/inode.h
diff --git a/libbcachefs/io_misc.c b/c_src/libbcachefs/io_misc.c
index ca6d5f51..ca6d5f51 100644
--- a/libbcachefs/io_misc.c
+++ b/c_src/libbcachefs/io_misc.c
diff --git a/libbcachefs/io_misc.h b/c_src/libbcachefs/io_misc.h
index 9cb44a7c..9cb44a7c 100644
--- a/libbcachefs/io_misc.h
+++ b/c_src/libbcachefs/io_misc.h
diff --git a/libbcachefs/io_read.c b/c_src/libbcachefs/io_read.c
index 3c574d88..3c574d88 100644
--- a/libbcachefs/io_read.c
+++ b/c_src/libbcachefs/io_read.c
diff --git a/libbcachefs/io_read.h b/c_src/libbcachefs/io_read.h
index d9c18bb7..d9c18bb7 100644
--- a/libbcachefs/io_read.h
+++ b/c_src/libbcachefs/io_read.h
diff --git a/libbcachefs/io_write.c b/c_src/libbcachefs/io_write.c
index 33c0e783..33c0e783 100644
--- a/libbcachefs/io_write.c
+++ b/c_src/libbcachefs/io_write.c
diff --git a/libbcachefs/io_write.h b/c_src/libbcachefs/io_write.h
index 6c276a48..6c276a48 100644
--- a/libbcachefs/io_write.h
+++ b/c_src/libbcachefs/io_write.h
diff --git a/libbcachefs/io_write_types.h b/c_src/libbcachefs/io_write_types.h
index c7f97c2c..c7f97c2c 100644
--- a/libbcachefs/io_write_types.h
+++ b/c_src/libbcachefs/io_write_types.h
diff --git a/libbcachefs/journal.c b/c_src/libbcachefs/journal.c
index 8538ef34..8538ef34 100644
--- a/libbcachefs/journal.c
+++ b/c_src/libbcachefs/journal.c
diff --git a/libbcachefs/journal.h b/c_src/libbcachefs/journal.h
index 4544ce24..4544ce24 100644
--- a/libbcachefs/journal.h
+++ b/c_src/libbcachefs/journal.h
diff --git a/libbcachefs/journal_io.c b/c_src/libbcachefs/journal_io.c
index b0f4dd49..b0f4dd49 100644
--- a/libbcachefs/journal_io.c
+++ b/c_src/libbcachefs/journal_io.c
diff --git a/libbcachefs/journal_io.h b/c_src/libbcachefs/journal_io.h
index c035e7c1..c035e7c1 100644
--- a/libbcachefs/journal_io.h
+++ b/c_src/libbcachefs/journal_io.h
diff --git a/libbcachefs/journal_reclaim.c b/c_src/libbcachefs/journal_reclaim.c
index 820d25e1..820d25e1 100644
--- a/libbcachefs/journal_reclaim.c
+++ b/c_src/libbcachefs/journal_reclaim.c
diff --git a/libbcachefs/journal_reclaim.h b/c_src/libbcachefs/journal_reclaim.h
index ec84c334..ec84c334 100644
--- a/libbcachefs/journal_reclaim.h
+++ b/c_src/libbcachefs/journal_reclaim.h
diff --git a/libbcachefs/journal_sb.c b/c_src/libbcachefs/journal_sb.c
index ae4fb8c3..ae4fb8c3 100644
--- a/libbcachefs/journal_sb.c
+++ b/c_src/libbcachefs/journal_sb.c
diff --git a/libbcachefs/journal_sb.h b/c_src/libbcachefs/journal_sb.h
index ba40a7e8..ba40a7e8 100644
--- a/libbcachefs/journal_sb.h
+++ b/c_src/libbcachefs/journal_sb.h
diff --git a/libbcachefs/journal_seq_blacklist.c b/c_src/libbcachefs/journal_seq_blacklist.c
index 0200e299..0200e299 100644
--- a/libbcachefs/journal_seq_blacklist.c
+++ b/c_src/libbcachefs/journal_seq_blacklist.c
diff --git a/libbcachefs/journal_seq_blacklist.h b/c_src/libbcachefs/journal_seq_blacklist.h
index afb886ec..afb886ec 100644
--- a/libbcachefs/journal_seq_blacklist.h
+++ b/c_src/libbcachefs/journal_seq_blacklist.h
diff --git a/libbcachefs/journal_types.h b/c_src/libbcachefs/journal_types.h
index 38817c7a..38817c7a 100644
--- a/libbcachefs/journal_types.h
+++ b/c_src/libbcachefs/journal_types.h
diff --git a/libbcachefs/keylist.c b/c_src/libbcachefs/keylist.c
index 1b828bdd..1b828bdd 100644
--- a/libbcachefs/keylist.c
+++ b/c_src/libbcachefs/keylist.c
diff --git a/libbcachefs/keylist.h b/c_src/libbcachefs/keylist.h
index e687e0e9..e687e0e9 100644
--- a/libbcachefs/keylist.h
+++ b/c_src/libbcachefs/keylist.h
diff --git a/libbcachefs/keylist_types.h b/c_src/libbcachefs/keylist_types.h
index 4b3ff7d8..4b3ff7d8 100644
--- a/libbcachefs/keylist_types.h
+++ b/c_src/libbcachefs/keylist_types.h
diff --git a/libbcachefs/logged_ops.c b/c_src/libbcachefs/logged_ops.c
index ad598105..ad598105 100644
--- a/libbcachefs/logged_ops.c
+++ b/c_src/libbcachefs/logged_ops.c
diff --git a/libbcachefs/logged_ops.h b/c_src/libbcachefs/logged_ops.h
index 4d1e786a..4d1e786a 100644
--- a/libbcachefs/logged_ops.h
+++ b/c_src/libbcachefs/logged_ops.h
diff --git a/libbcachefs/lru.c b/c_src/libbcachefs/lru.c
index 7a4ca5a2..7a4ca5a2 100644
--- a/libbcachefs/lru.c
+++ b/c_src/libbcachefs/lru.c
diff --git a/libbcachefs/lru.h b/c_src/libbcachefs/lru.h
index 429dca81..429dca81 100644
--- a/libbcachefs/lru.h
+++ b/c_src/libbcachefs/lru.h
diff --git a/libbcachefs/mean_and_variance.c b/c_src/libbcachefs/mean_and_variance.c
index bf0ef668..bf0ef668 100644
--- a/libbcachefs/mean_and_variance.c
+++ b/c_src/libbcachefs/mean_and_variance.c
diff --git a/libbcachefs/mean_and_variance.h b/c_src/libbcachefs/mean_and_variance.h
index b2be565b..b2be565b 100644
--- a/libbcachefs/mean_and_variance.h
+++ b/c_src/libbcachefs/mean_and_variance.h
diff --git a/libbcachefs/migrate.c b/c_src/libbcachefs/migrate.c
index 5623cee3..5623cee3 100644
--- a/libbcachefs/migrate.c
+++ b/c_src/libbcachefs/migrate.c
diff --git a/libbcachefs/migrate.h b/c_src/libbcachefs/migrate.h
index 027efaa0..027efaa0 100644
--- a/libbcachefs/migrate.h
+++ b/c_src/libbcachefs/migrate.h
diff --git a/libbcachefs/move.c b/c_src/libbcachefs/move.c
index 7a33319d..7a33319d 100644
--- a/libbcachefs/move.c
+++ b/c_src/libbcachefs/move.c
diff --git a/libbcachefs/move.h b/c_src/libbcachefs/move.h
index 9baf3093..9baf3093 100644
--- a/libbcachefs/move.h
+++ b/c_src/libbcachefs/move.h
diff --git a/libbcachefs/move_types.h b/c_src/libbcachefs/move_types.h
index e22841ef..e22841ef 100644
--- a/libbcachefs/move_types.h
+++ b/c_src/libbcachefs/move_types.h
diff --git a/libbcachefs/movinggc.c b/c_src/libbcachefs/movinggc.c
index 69e06a84..69e06a84 100644
--- a/libbcachefs/movinggc.c
+++ b/c_src/libbcachefs/movinggc.c
diff --git a/libbcachefs/movinggc.h b/c_src/libbcachefs/movinggc.h
index ea181fef..ea181fef 100644
--- a/libbcachefs/movinggc.h
+++ b/c_src/libbcachefs/movinggc.h
diff --git a/libbcachefs/nocow_locking.c b/c_src/libbcachefs/nocow_locking.c
index 3c21981a..3c21981a 100644
--- a/libbcachefs/nocow_locking.c
+++ b/c_src/libbcachefs/nocow_locking.c
diff --git a/libbcachefs/nocow_locking.h b/c_src/libbcachefs/nocow_locking.h
index f9d6a426..f9d6a426 100644
--- a/libbcachefs/nocow_locking.h
+++ b/c_src/libbcachefs/nocow_locking.h
diff --git a/libbcachefs/nocow_locking_types.h b/c_src/libbcachefs/nocow_locking_types.h
index bd12bf67..bd12bf67 100644
--- a/libbcachefs/nocow_locking_types.h
+++ b/c_src/libbcachefs/nocow_locking_types.h
diff --git a/libbcachefs/opts.c b/c_src/libbcachefs/opts.c
index 8e6f230e..8e6f230e 100644
--- a/libbcachefs/opts.c
+++ b/c_src/libbcachefs/opts.c
diff --git a/libbcachefs/opts.h b/c_src/libbcachefs/opts.h
index 93a24fef..93a24fef 100644
--- a/libbcachefs/opts.h
+++ b/c_src/libbcachefs/opts.h
diff --git a/libbcachefs/printbuf.c b/c_src/libbcachefs/printbuf.c
index accf246c..accf246c 100644
--- a/libbcachefs/printbuf.c
+++ b/c_src/libbcachefs/printbuf.c
diff --git a/libbcachefs/printbuf.h b/c_src/libbcachefs/printbuf.h
index 9a4a56c4..9a4a56c4 100644
--- a/libbcachefs/printbuf.h
+++ b/c_src/libbcachefs/printbuf.h
diff --git a/libbcachefs/quota.c b/c_src/libbcachefs/quota.c
index e68b34ea..e68b34ea 100644
--- a/libbcachefs/quota.c
+++ b/c_src/libbcachefs/quota.c
diff --git a/libbcachefs/quota.h b/c_src/libbcachefs/quota.h
index 884f601f..884f601f 100644
--- a/libbcachefs/quota.h
+++ b/c_src/libbcachefs/quota.h
diff --git a/libbcachefs/quota_types.h b/c_src/libbcachefs/quota_types.h
index 6a136083..6a136083 100644
--- a/libbcachefs/quota_types.h
+++ b/c_src/libbcachefs/quota_types.h
diff --git a/libbcachefs/rebalance.c b/c_src/libbcachefs/rebalance.c
index 95f46cb3..95f46cb3 100644
--- a/libbcachefs/rebalance.c
+++ b/c_src/libbcachefs/rebalance.c
diff --git a/libbcachefs/rebalance.h b/c_src/libbcachefs/rebalance.h
index 28a52638..28a52638 100644
--- a/libbcachefs/rebalance.h
+++ b/c_src/libbcachefs/rebalance.h
diff --git a/libbcachefs/rebalance_types.h b/c_src/libbcachefs/rebalance_types.h
index 0fffb536..0fffb536 100644
--- a/libbcachefs/rebalance_types.h
+++ b/c_src/libbcachefs/rebalance_types.h
diff --git a/libbcachefs/recovery.c b/c_src/libbcachefs/recovery.c
index 72521460..72521460 100644
--- a/libbcachefs/recovery.c
+++ b/c_src/libbcachefs/recovery.c
diff --git a/libbcachefs/recovery.h b/c_src/libbcachefs/recovery.h
index 4e9d2471..4e9d2471 100644
--- a/libbcachefs/recovery.h
+++ b/c_src/libbcachefs/recovery.h
diff --git a/libbcachefs/recovery_types.h b/c_src/libbcachefs/recovery_types.h
index fa0c8efd..fa0c8efd 100644
--- a/libbcachefs/recovery_types.h
+++ b/c_src/libbcachefs/recovery_types.h
diff --git a/libbcachefs/reflink.c b/c_src/libbcachefs/reflink.c
index b24b71bc..b24b71bc 100644
--- a/libbcachefs/reflink.c
+++ b/c_src/libbcachefs/reflink.c
diff --git a/libbcachefs/reflink.h b/c_src/libbcachefs/reflink.h
index 8ee778ec..8ee778ec 100644
--- a/libbcachefs/reflink.h
+++ b/c_src/libbcachefs/reflink.h
diff --git a/libbcachefs/replicas.c b/c_src/libbcachefs/replicas.c
index 92ba56ef..92ba56ef 100644
--- a/libbcachefs/replicas.c
+++ b/c_src/libbcachefs/replicas.c
diff --git a/libbcachefs/replicas.h b/c_src/libbcachefs/replicas.h
index 654a4b26..654a4b26 100644
--- a/libbcachefs/replicas.h
+++ b/c_src/libbcachefs/replicas.h
diff --git a/libbcachefs/replicas_types.h b/c_src/libbcachefs/replicas_types.h
index ac90d142..ac90d142 100644
--- a/libbcachefs/replicas_types.h
+++ b/c_src/libbcachefs/replicas_types.h
diff --git a/libbcachefs/sb-clean.c b/c_src/libbcachefs/sb-clean.c
index 9632f36f..9632f36f 100644
--- a/libbcachefs/sb-clean.c
+++ b/c_src/libbcachefs/sb-clean.c
diff --git a/libbcachefs/sb-clean.h b/c_src/libbcachefs/sb-clean.h
index 71caef28..71caef28 100644
--- a/libbcachefs/sb-clean.h
+++ b/c_src/libbcachefs/sb-clean.h
diff --git a/libbcachefs/sb-downgrade.c b/c_src/libbcachefs/sb-downgrade.c
index 441dcb1b..441dcb1b 100644
--- a/libbcachefs/sb-downgrade.c
+++ b/c_src/libbcachefs/sb-downgrade.c
diff --git a/libbcachefs/sb-downgrade.h b/c_src/libbcachefs/sb-downgrade.h
index 57e6c916..57e6c916 100644
--- a/libbcachefs/sb-downgrade.h
+++ b/c_src/libbcachefs/sb-downgrade.h
diff --git a/libbcachefs/sb-errors.c b/c_src/libbcachefs/sb-errors.c
index 5f5bcae3..5f5bcae3 100644
--- a/libbcachefs/sb-errors.c
+++ b/c_src/libbcachefs/sb-errors.c
diff --git a/libbcachefs/sb-errors.h b/c_src/libbcachefs/sb-errors.h
index 8889001e..8889001e 100644
--- a/libbcachefs/sb-errors.h
+++ b/c_src/libbcachefs/sb-errors.h
diff --git a/libbcachefs/sb-errors_types.h b/c_src/libbcachefs/sb-errors_types.h
index c08aacdf..c08aacdf 100644
--- a/libbcachefs/sb-errors_types.h
+++ b/c_src/libbcachefs/sb-errors_types.h
diff --git a/libbcachefs/sb-members.c b/c_src/libbcachefs/sb-members.c
index a44a238b..a44a238b 100644
--- a/libbcachefs/sb-members.c
+++ b/c_src/libbcachefs/sb-members.c
diff --git a/libbcachefs/sb-members.h b/c_src/libbcachefs/sb-members.h
index be0a9418..be0a9418 100644
--- a/libbcachefs/sb-members.h
+++ b/c_src/libbcachefs/sb-members.h
diff --git a/libbcachefs/seqmutex.h b/c_src/libbcachefs/seqmutex.h
index c1860d81..c1860d81 100644
--- a/libbcachefs/seqmutex.h
+++ b/c_src/libbcachefs/seqmutex.h
diff --git a/libbcachefs/siphash.c b/c_src/libbcachefs/siphash.c
index dc1a27cc..dc1a27cc 100644
--- a/libbcachefs/siphash.c
+++ b/c_src/libbcachefs/siphash.c
diff --git a/libbcachefs/siphash.h b/c_src/libbcachefs/siphash.h
index 3dfaf34a..3dfaf34a 100644
--- a/libbcachefs/siphash.h
+++ b/c_src/libbcachefs/siphash.h
diff --git a/libbcachefs/six.c b/c_src/libbcachefs/six.c
index 3a494c5d..3a494c5d 100644
--- a/libbcachefs/six.c
+++ b/c_src/libbcachefs/six.c
diff --git a/libbcachefs/six.h b/c_src/libbcachefs/six.h
index 68d46fd7..68d46fd7 100644
--- a/libbcachefs/six.h
+++ b/c_src/libbcachefs/six.h
diff --git a/libbcachefs/snapshot.c b/c_src/libbcachefs/snapshot.c
index 56af9375..56af9375 100644
--- a/libbcachefs/snapshot.c
+++ b/c_src/libbcachefs/snapshot.c
diff --git a/libbcachefs/snapshot.h b/c_src/libbcachefs/snapshot.h
index 7c66ffc0..7c66ffc0 100644
--- a/libbcachefs/snapshot.h
+++ b/c_src/libbcachefs/snapshot.h
diff --git a/libbcachefs/str_hash.h b/c_src/libbcachefs/str_hash.h
index 89fdb7c2..89fdb7c2 100644
--- a/libbcachefs/str_hash.h
+++ b/c_src/libbcachefs/str_hash.h
diff --git a/libbcachefs/subvolume.c b/c_src/libbcachefs/subvolume.c
index 7c67c28d..7c67c28d 100644
--- a/libbcachefs/subvolume.c
+++ b/c_src/libbcachefs/subvolume.c
diff --git a/libbcachefs/subvolume.h b/c_src/libbcachefs/subvolume.h
index a6f56f66..a6f56f66 100644
--- a/libbcachefs/subvolume.h
+++ b/c_src/libbcachefs/subvolume.h
diff --git a/libbcachefs/subvolume_types.h b/c_src/libbcachefs/subvolume_types.h
index ae644adf..ae644adf 100644
--- a/libbcachefs/subvolume_types.h
+++ b/c_src/libbcachefs/subvolume_types.h
diff --git a/libbcachefs/super-io.c b/c_src/libbcachefs/super-io.c
index 55926b81..55926b81 100644
--- a/libbcachefs/super-io.c
+++ b/c_src/libbcachefs/super-io.c
diff --git a/libbcachefs/super-io.h b/c_src/libbcachefs/super-io.h
index 95e80e06..95e80e06 100644
--- a/libbcachefs/super-io.h
+++ b/c_src/libbcachefs/super-io.h
diff --git a/libbcachefs/super.c b/c_src/libbcachefs/super.c
index 9dbc3594..9dbc3594 100644
--- a/libbcachefs/super.c
+++ b/c_src/libbcachefs/super.c
diff --git a/libbcachefs/super.h b/c_src/libbcachefs/super.h
index dada0933..dada0933 100644
--- a/libbcachefs/super.h
+++ b/c_src/libbcachefs/super.h
diff --git a/libbcachefs/super_types.h b/c_src/libbcachefs/super_types.h
index 87d159b9..87d159b9 100644
--- a/libbcachefs/super_types.h
+++ b/c_src/libbcachefs/super_types.h
diff --git a/libbcachefs/sysfs.c b/c_src/libbcachefs/sysfs.c
index 8ed52319..8ed52319 100644
--- a/libbcachefs/sysfs.c
+++ b/c_src/libbcachefs/sysfs.c
diff --git a/libbcachefs/sysfs.h b/c_src/libbcachefs/sysfs.h
index 222cd506..222cd506 100644
--- a/libbcachefs/sysfs.h
+++ b/c_src/libbcachefs/sysfs.h
diff --git a/libbcachefs/tests.c b/c_src/libbcachefs/tests.c
index b3fe9fc5..b3fe9fc5 100644
--- a/libbcachefs/tests.c
+++ b/c_src/libbcachefs/tests.c
diff --git a/libbcachefs/tests.h b/c_src/libbcachefs/tests.h
index c73b18ae..c73b18ae 100644
--- a/libbcachefs/tests.h
+++ b/c_src/libbcachefs/tests.h
diff --git a/libbcachefs/thread_with_file.c b/c_src/libbcachefs/thread_with_file.c
index b1c867aa..b1c867aa 100644
--- a/libbcachefs/thread_with_file.c
+++ b/c_src/libbcachefs/thread_with_file.c
diff --git a/libbcachefs/thread_with_file.h b/c_src/libbcachefs/thread_with_file.h
index 05879c50..05879c50 100644
--- a/libbcachefs/thread_with_file.h
+++ b/c_src/libbcachefs/thread_with_file.h
diff --git a/libbcachefs/thread_with_file_types.h b/c_src/libbcachefs/thread_with_file_types.h
index 90b5e645..90b5e645 100644
--- a/libbcachefs/thread_with_file_types.h
+++ b/c_src/libbcachefs/thread_with_file_types.h
diff --git a/libbcachefs/trace.c b/c_src/libbcachefs/trace.c
index dc48b52b..dc48b52b 100644
--- a/libbcachefs/trace.c
+++ b/c_src/libbcachefs/trace.c
diff --git a/libbcachefs/trace.h b/c_src/libbcachefs/trace.h
index c94876b3..c94876b3 100644
--- a/libbcachefs/trace.h
+++ b/c_src/libbcachefs/trace.h
diff --git a/libbcachefs/two_state_shared_lock.c b/c_src/libbcachefs/two_state_shared_lock.c
index 9764c2e6..9764c2e6 100644
--- a/libbcachefs/two_state_shared_lock.c
+++ b/c_src/libbcachefs/two_state_shared_lock.c
diff --git a/libbcachefs/two_state_shared_lock.h b/c_src/libbcachefs/two_state_shared_lock.h
index 90580177..90580177 100644
--- a/libbcachefs/two_state_shared_lock.h
+++ b/c_src/libbcachefs/two_state_shared_lock.h
diff --git a/libbcachefs/util.c b/c_src/libbcachefs/util.c
index c2ef7cdd..c2ef7cdd 100644
--- a/libbcachefs/util.c
+++ b/c_src/libbcachefs/util.c
diff --git a/libbcachefs/util.h b/c_src/libbcachefs/util.h
index c75fc319..c75fc319 100644
--- a/libbcachefs/util.h
+++ b/c_src/libbcachefs/util.h
diff --git a/libbcachefs/varint.c b/c_src/libbcachefs/varint.c
index cb4f33ed..cb4f33ed 100644
--- a/libbcachefs/varint.c
+++ b/c_src/libbcachefs/varint.c
diff --git a/libbcachefs/varint.h b/c_src/libbcachefs/varint.h
index 92a182fb..92a182fb 100644
--- a/libbcachefs/varint.h
+++ b/c_src/libbcachefs/varint.h
diff --git a/libbcachefs/vstructs.h b/c_src/libbcachefs/vstructs.h
index 2ad338e2..2ad338e2 100644
--- a/libbcachefs/vstructs.h
+++ b/c_src/libbcachefs/vstructs.h
diff --git a/libbcachefs/xattr.c b/c_src/libbcachefs/xattr.c
index 5a1858fb..5a1858fb 100644
--- a/libbcachefs/xattr.c
+++ b/c_src/libbcachefs/xattr.c
diff --git a/libbcachefs/xattr.h b/c_src/libbcachefs/xattr.h
index 1337f31a..1337f31a 100644
--- a/libbcachefs/xattr.h
+++ b/c_src/libbcachefs/xattr.h
diff --git a/linux/atomic64.c b/c_src/linux/atomic64.c
index 4654d092..4654d092 100644
--- a/linux/atomic64.c
+++ b/c_src/linux/atomic64.c
diff --git a/linux/bio.c b/c_src/linux/bio.c
index 93a791c4..93a791c4 100644
--- a/linux/bio.c
+++ b/c_src/linux/bio.c
diff --git a/linux/blkdev.c b/c_src/linux/blkdev.c
index 61f23362..61f23362 100644
--- a/linux/blkdev.c
+++ b/c_src/linux/blkdev.c
diff --git a/linux/closure.c b/c_src/linux/closure.c
index c1654055..c1654055 100644
--- a/linux/closure.c
+++ b/c_src/linux/closure.c
diff --git a/linux/crc64.c b/c_src/linux/crc64.c
index 0ef8ae6a..0ef8ae6a 100644
--- a/linux/crc64.c
+++ b/c_src/linux/crc64.c
diff --git a/linux/crc64table.h b/c_src/linux/crc64table.h
index 9964164d..9964164d 100644
--- a/linux/crc64table.h
+++ b/c_src/linux/crc64table.h
diff --git a/linux/crypto/api.c b/c_src/linux/crypto/api.c
index 2f3ab2b5..2f3ab2b5 100644
--- a/linux/crypto/api.c
+++ b/c_src/linux/crypto/api.c
diff --git a/linux/crypto/chacha20_generic.c b/c_src/linux/crypto/chacha20_generic.c
index 914189e7..914189e7 100644
--- a/linux/crypto/chacha20_generic.c
+++ b/c_src/linux/crypto/chacha20_generic.c
diff --git a/linux/crypto/poly1305_generic.c b/c_src/linux/crypto/poly1305_generic.c
index acb554c0..acb554c0 100644
--- a/linux/crypto/poly1305_generic.c
+++ b/c_src/linux/crypto/poly1305_generic.c
diff --git a/linux/crypto/sha256_generic.c b/c_src/linux/crypto/sha256_generic.c
index 9326bfe7..9326bfe7 100644
--- a/linux/crypto/sha256_generic.c
+++ b/c_src/linux/crypto/sha256_generic.c
diff --git a/linux/fs.c b/c_src/linux/fs.c
index 623ca266..623ca266 100644
--- a/linux/fs.c
+++ b/c_src/linux/fs.c
diff --git a/linux/generic-radix-tree.c b/c_src/linux/generic-radix-tree.c
index 41f1bcdc..41f1bcdc 100644
--- a/linux/generic-radix-tree.c
+++ b/c_src/linux/generic-radix-tree.c
diff --git a/linux/int_sqrt.c b/c_src/linux/int_sqrt.c
index a8170bb9..a8170bb9 100644
--- a/linux/int_sqrt.c
+++ b/c_src/linux/int_sqrt.c
diff --git a/linux/kstrtox.c b/c_src/linux/kstrtox.c
index bde55808..bde55808 100644
--- a/linux/kstrtox.c
+++ b/c_src/linux/kstrtox.c
diff --git a/linux/kstrtox.h b/c_src/linux/kstrtox.h
index 910b6de8..910b6de8 100644
--- a/linux/kstrtox.h
+++ b/c_src/linux/kstrtox.h
diff --git a/linux/kthread.c b/c_src/linux/kthread.c
index 17830e5f..17830e5f 100644
--- a/linux/kthread.c
+++ b/c_src/linux/kthread.c
diff --git a/linux/llist.c b/c_src/linux/llist.c
index 611ce488..611ce488 100644
--- a/linux/llist.c
+++ b/c_src/linux/llist.c
diff --git a/linux/mempool.c b/c_src/linux/mempool.c
index 74d4fbb3..74d4fbb3 100644
--- a/linux/mempool.c
+++ b/c_src/linux/mempool.c
diff --git a/linux/preempt.c b/c_src/linux/preempt.c
index 72eceed3..72eceed3 100644
--- a/linux/preempt.c
+++ b/c_src/linux/preempt.c
diff --git a/linux/ratelimit.c b/c_src/linux/ratelimit.c
index 21a6d6c8..21a6d6c8 100644
--- a/linux/ratelimit.c
+++ b/c_src/linux/ratelimit.c
diff --git a/linux/rhashtable.c b/c_src/linux/rhashtable.c
index ba2196fc..ba2196fc 100644
--- a/linux/rhashtable.c
+++ b/c_src/linux/rhashtable.c
diff --git a/linux/sched.c b/c_src/linux/sched.c
index 1c7198d2..1c7198d2 100644
--- a/linux/sched.c
+++ b/c_src/linux/sched.c
diff --git a/linux/semaphore.c b/c_src/linux/semaphore.c
index b7d4b517..b7d4b517 100644
--- a/linux/semaphore.c
+++ b/c_src/linux/semaphore.c
diff --git a/linux/seq_buf.c b/c_src/linux/seq_buf.c
index cf8709ad..cf8709ad 100644
--- a/linux/seq_buf.c
+++ b/c_src/linux/seq_buf.c
diff --git a/linux/shrinker.c b/c_src/linux/shrinker.c
index ca34ebc7..ca34ebc7 100644
--- a/linux/shrinker.c
+++ b/c_src/linux/shrinker.c
diff --git a/linux/siphash.c b/c_src/linux/siphash.c
index f8dbecea..f8dbecea 100644
--- a/linux/siphash.c
+++ b/c_src/linux/siphash.c
diff --git a/linux/string.c b/c_src/linux/string.c
index a32a8995..a32a8995 100644
--- a/linux/string.c
+++ b/c_src/linux/string.c
diff --git a/linux/string_helpers.c b/c_src/linux/string_helpers.c
index 0810ca13..0810ca13 100644
--- a/linux/string_helpers.c
+++ b/c_src/linux/string_helpers.c
diff --git a/linux/timer.c b/c_src/linux/timer.c
index 7d519a4d..7d519a4d 100644
--- a/linux/timer.c
+++ b/c_src/linux/timer.c
diff --git a/linux/wait.c b/c_src/linux/wait.c
index b1f002b9..b1f002b9 100644
--- a/linux/wait.c
+++ b/c_src/linux/wait.c
diff --git a/linux/workqueue.c b/c_src/linux/workqueue.c
index 0d5af3fb..0d5af3fb 100644
--- a/linux/workqueue.c
+++ b/c_src/linux/workqueue.c
diff --git a/linux/xxhash.c b/c_src/linux/xxhash.c
index d5bb9ff1..d5bb9ff1 100644
--- a/linux/xxhash.c
+++ b/c_src/linux/xxhash.c
diff --git a/linux/zstd_compress_module.c b/c_src/linux/zstd_compress_module.c
index 35cc5cba..35cc5cba 100644
--- a/linux/zstd_compress_module.c
+++ b/c_src/linux/zstd_compress_module.c
diff --git a/linux/zstd_decompress_module.c b/c_src/linux/zstd_decompress_module.c
index 7e8cd446..7e8cd446 100644
--- a/linux/zstd_decompress_module.c
+++ b/c_src/linux/zstd_decompress_module.c
diff --git a/qcow2.c b/c_src/qcow2.c
index 30a6e056..30a6e056 100644
--- a/qcow2.c
+++ b/c_src/qcow2.c
diff --git a/qcow2.h b/c_src/qcow2.h
index 0943d55c..0943d55c 100644
--- a/qcow2.h
+++ b/c_src/qcow2.h
diff --git a/raid/COPYING b/c_src/raid/COPYING
index a43ea212..a43ea212 100644
--- a/raid/COPYING
+++ b/c_src/raid/COPYING
diff --git a/raid/check.c b/c_src/raid/check.c
index 9bed9337..9bed9337 100644
--- a/raid/check.c
+++ b/c_src/raid/check.c
diff --git a/raid/combo.h b/c_src/raid/combo.h
index 8efc31ad..8efc31ad 100644
--- a/raid/combo.h
+++ b/c_src/raid/combo.h
diff --git a/raid/cpu.h b/c_src/raid/cpu.h
index ed909bb7..ed909bb7 100644
--- a/raid/cpu.h
+++ b/c_src/raid/cpu.h
diff --git a/raid/gf.h b/c_src/raid/gf.h
index 1702c287..1702c287 100644
--- a/raid/gf.h
+++ b/c_src/raid/gf.h
diff --git a/raid/helper.c b/c_src/raid/helper.c
index f66093fa..f66093fa 100644
--- a/raid/helper.c
+++ b/c_src/raid/helper.c
diff --git a/raid/helper.h b/c_src/raid/helper.h
index bf682882..bf682882 100644
--- a/raid/helper.h
+++ b/c_src/raid/helper.h
diff --git a/raid/int.c b/c_src/raid/int.c
index e16332a5..e16332a5 100644
--- a/raid/int.c
+++ b/c_src/raid/int.c
diff --git a/raid/internal.h b/c_src/raid/internal.h
index 4465cb97..4465cb97 100644
--- a/raid/internal.h
+++ b/c_src/raid/internal.h
diff --git a/raid/intz.c b/c_src/raid/intz.c
index 80c20142..80c20142 100644
--- a/raid/intz.c
+++ b/c_src/raid/intz.c
diff --git a/raid/memory.c b/c_src/raid/memory.c
index 02a5a927..02a5a927 100644
--- a/raid/memory.c
+++ b/c_src/raid/memory.c
diff --git a/raid/memory.h b/c_src/raid/memory.h
index de00614f..de00614f 100644
--- a/raid/memory.h
+++ b/c_src/raid/memory.h
diff --git a/raid/module.c b/c_src/raid/module.c
index b688d22c..b688d22c 100644
--- a/raid/module.c
+++ b/c_src/raid/module.c
diff --git a/raid/raid.c b/c_src/raid/raid.c
index 3052675f..3052675f 100644
--- a/raid/raid.c
+++ b/c_src/raid/raid.c
diff --git a/raid/raid.h b/c_src/raid/raid.h
index aeeb39f3..aeeb39f3 100644
--- a/raid/raid.h
+++ b/c_src/raid/raid.h
diff --git a/raid/tables.c b/c_src/raid/tables.c
index 49035022..49035022 100644
--- a/raid/tables.c
+++ b/c_src/raid/tables.c
diff --git a/raid/tag.c b/c_src/raid/tag.c
index bfeefaad..bfeefaad 100644
--- a/raid/tag.c
+++ b/c_src/raid/tag.c
diff --git a/raid/test.c b/c_src/raid/test.c
index feb8a415..feb8a415 100644
--- a/raid/test.c
+++ b/c_src/raid/test.c
diff --git a/raid/test.h b/c_src/raid/test.h
index 6d902c7f..6d902c7f 100644
--- a/raid/test.h
+++ b/c_src/raid/test.h
diff --git a/raid/x86.c b/c_src/raid/x86.c
index 84b12c1c..84b12c1c 100644
--- a/raid/x86.c
+++ b/c_src/raid/x86.c
diff --git a/raid/x86z.c b/c_src/raid/x86z.c
index 1e3fe89a..1e3fe89a 100644
--- a/raid/x86z.c
+++ b/c_src/raid/x86z.c
diff --git a/tools-util.c b/c_src/tools-util.c
index a1bcd8eb..a1bcd8eb 100644
--- a/tools-util.c
+++ b/c_src/tools-util.c
diff --git a/tools-util.h b/c_src/tools-util.h
index 56331384..56331384 100644
--- a/tools-util.h
+++ b/c_src/tools-util.h
diff --git a/make-release-tarball.sh b/make-release-tarball.sh
index 32e4772c..c468da77 100755
--- a/make-release-tarball.sh
+++ b/make-release-tarball.sh
@@ -7,7 +7,7 @@ version=$1
 git checkout v$version
 git clean -xfd
 
-(cd rust-src; cargo license) > COPYING.rust-dependencies
+cargo license > COPYING.rust-dependencies
 
 git ls-files|
     tar --create --file bcachefs-tools-$version.tar -T -	\
@@ -28,7 +28,7 @@ scp bcachefs-tools-$version.tar.zst	evilpiepirate.org:/var/www/htdocs/bcachefs-t
 scp bcachefs-tools-$version.tar.asc	evilpiepirate.org:/var/www/htdocs/bcachefs-tools/
 scp bcachefs-tools-$version.tar.sign	evilpiepirate.org:/var/www/htdocs/bcachefs-tools/
 
-cargo vendor --manifest-path rust-src/Cargo.toml
+cargo vendor
 
 mkdir .cargo
 cat > .cargo/config.toml <<-ZZ
diff --git a/rust-src/.gitignore b/rust-src/.gitignore
deleted file mode 100644
index 644cd426..00000000
--- a/rust-src/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
-
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-# Needed by nix
-# Cargo.lock
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
diff --git a/rust-src/README.md b/rust-src/README.md
deleted file mode 100644
index e4700f6b..00000000
--- a/rust-src/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-Usage
-=====
-
-```
-bcachefs-mount 0.1.0
-Mount a bcachefs filesystem by its UUID
-
-USAGE:
-    bcachefs-mount [OPTIONS] <uuid> <mountpoint>
-
-FLAGS:
-    -h, --help       
-            Prints help information
-
-    -V, --version    
-            Prints version information
-
-
-OPTIONS:
-    -o <options>                 
-            Mount options [default: ]
-
-    -p, --password <password>    
-            Where the password would be loaded from.
-            
-            Possible values are: "fail" - don't ask for password, fail if filesystem is encrypted; "wait" - wait for
-            password to become available before mounting; "ask" -  prompt the user for password; [default: fail]
-
-ARGS:
-    <uuid>          
-            External UUID of the bcachefs filesystem
-
-    <mountpoint>    
-            Where the filesystem should be mounted
-```
-
-Caveats
-=======
-
-* `--password ask` is not yet implemented, but you can use `--password wait`, and load the key with `bcachefs unlock`.
-
-Build
-=====
-
-```sh
-$ git submodule update --init --recursive
-$ cargo build --release
-```
-
-Binary will be built in `target/release/bcachefs-mount`
-
-Dependencies:
-
-* rust
-* blkid
-* uuid
-* liburcu
-* libsodium
-* zlib
-* liblz4
-* libzstd
-* libkeyutils
diff --git a/rust-src/bch_bindgen/src/libbcachefs_wrapper.h b/rust-src/bch_bindgen/src/libbcachefs_wrapper.h
deleted file mode 100644
index 5fb42613..00000000
--- a/rust-src/bch_bindgen/src/libbcachefs_wrapper.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "../libbcachefs/super-io.h"
-#include "../libbcachefs/checksum.h"
-#include "../libbcachefs/bcachefs_format.h"
-#include "../libbcachefs/btree_cache.h"
-#include "../libbcachefs/btree_iter.h"
-#include "../libbcachefs/debug.h"
-#include "../libbcachefs/errcode.h"
-#include "../libbcachefs/error.h"
-#include "../libbcachefs/opts.h"
-#include "../libbcachefs.h"
-#include "../crypto.h"
-#include "../include/linux/bio.h"
-#include "../include/linux/blkdev.h"
-#include "../cmds.h"
-#include "../raid/raid.h"
-
-
-#define MARK_FIX_753(req_name) const blk_mode_t Fix753_##req_name = req_name;
-
-MARK_FIX_753(BLK_OPEN_READ);
-MARK_FIX_753(BLK_OPEN_WRITE);
-MARK_FIX_753(BLK_OPEN_EXCL);
diff --git a/rust-src/rustfmt.toml b/rustfmt.toml
index 42f2ad7c..42f2ad7c 100644
--- a/rust-src/rustfmt.toml
+++ b/rustfmt.toml
diff --git a/rust-src/src/bcachefs.rs b/src/bcachefs.rs
index 95f5e1f0..95f5e1f0 100644
--- a/rust-src/src/bcachefs.rs
+++ b/src/bcachefs.rs
diff --git a/rust-src/src/commands/cmd_completions.rs b/src/commands/cmd_completions.rs
index 53cdd643..53cdd643 100644
--- a/rust-src/src/commands/cmd_completions.rs
+++ b/src/commands/cmd_completions.rs
diff --git a/rust-src/src/commands/cmd_list.rs b/src/commands/cmd_list.rs
index cb352916..cb352916 100644
--- a/rust-src/src/commands/cmd_list.rs
+++ b/src/commands/cmd_list.rs
diff --git a/rust-src/src/commands/cmd_mount.rs b/src/commands/cmd_mount.rs
index b120c91e..b120c91e 100644
--- a/rust-src/src/commands/cmd_mount.rs
+++ b/src/commands/cmd_mount.rs
diff --git a/rust-src/src/commands/logger.rs b/src/commands/logger.rs
index 2cd7b363..2cd7b363 100644
--- a/rust-src/src/commands/logger.rs
+++ b/src/commands/logger.rs
diff --git a/rust-src/src/commands/mod.rs b/src/commands/mod.rs
index e05a0848..e05a0848 100644
--- a/rust-src/src/commands/mod.rs
+++ b/src/commands/mod.rs
diff --git a/rust-src/src/key.rs b/src/key.rs
index 93daa263..93daa263 100644
--- a/rust-src/src/key.rs
+++ b/src/key.rs
diff --git a/tests/util.py b/tests/util.py
index 3ec38b29..68fe9e95 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -11,7 +11,7 @@ import time
 from pathlib import Path
 
 BASE_PATH= os.path.dirname(__file__)
-BCH_PATH = os.path.abspath(os.path.join(BASE_PATH, '../rust-src/target/release', 'bcachefs'))
+BCH_PATH = os.path.abspath(os.path.join(BASE_PATH, '../target/release', 'bcachefs'))
 VALGRIND_PATH= os.path.abspath(os.path.join(BASE_PATH,
     'valgrind-suppressions.txt'))