Update bcachefs sources to df6415fefb27 bcachefs: Fixes for rust bindgen

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 1a2b5b17ce0ecbd634c1bb9bbcaa7e57d4a74e24..f6757060767a41ef31b2cba8d64c7a77f76ff746 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-5d0a6c2b32f1542f01e47e767b0174de788dd8cc
+df6415fefb2790c3b95fa87ead779e7d2c654379

diff --git a/libbcachefs/mean_and_variance.h b/libbcachefs/mean_and_variance.h
index 647505010b3974b713823f96ddeab6a6aa8fe5df..b2be565bb8f214bc2ac4ebd6efac324ac20b7241 100644 (file)
--- a/libbcachefs/mean_and_variance.h
+++ b/libbcachefs/mean_and_variance.h
@@ -12,9 +12,12 @@
 /*
  * u128_u: u128 user mode, because not all architectures support a real int128
  * type
+ *
+ * We don't use this version in userspace, because in userspace we link with
+ * Rust and rustc has issues with u128.
  */
 
-#ifdef __SIZEOF_INT128__
+#if defined(__SIZEOF_INT128__) && defined(__KERNEL__)
 
 typedef struct {
        unsigned __int128 v;

diff --git a/libbcachefs/subvolume_types.h b/libbcachefs/subvolume_types.h
index 2d2e66a4e4681ee5ba6ba18666d135ab961a2cbf..ae644adfc391680d85b6fe53c25f08ae9337e037 100644 (file)
--- a/libbcachefs/subvolume_types.h
+++ b/libbcachefs/subvolume_types.h
@@ -20,7 +20,11 @@ struct snapshot_t {
 };
 
 struct snapshot_table {
+#ifndef RUST_BINDGEN
        DECLARE_FLEX_ARRAY(struct snapshot_t, s);
+#else
+       struct snapshot_t       s[0];
+#endif
 };
 
 typedef struct {