chore(tvix/castore/fuse): update fuse-backend-rs r/8725

This release includes support for overlay filesystems

Change-Id: I946cbf346df045209afaea2d720bb57fc2f2659f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12538
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: yuka <yuka@yuka.dev>
Tested-by: BuildkiteCI

4 files changed, 20 insertions, 13 deletions

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 6ce289f1a4d4..22f4d194d43a 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -1231,9 +1231,9 @@ dependencies = [
 
 [[package]]
 name = "fuse-backend-rs"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5a63a89f40ec26a0a1434e89de3f4ee939a920eae15d641053ee09ee6ed44b"
+checksum = "e1663480cae165243a6c7f75abecfb868c16d17346afc74faf61a2febcadd11b"
 dependencies = [
  "arc-swap",
  "bitflags 1.3.2",
@@ -1244,6 +1244,7 @@ dependencies = [
  "log",
  "mio 0.8.11",
  "nix 0.24.3",
+ "radix_trie",
  "vhost",
  "virtio-queue",
  "vm-memory",
@@ -2805,8 +2806,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.10.5",
+ "heck 0.5.0",
+ "itertools 0.13.0",
  "log",
  "multimap",
  "once_cell",
@@ -2828,7 +2829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "syn 2.0.76",
@@ -2864,7 +2865,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a669d5acbe719010c6f62a64e6d7d88fdedc1fe46e419747949ecb6312e9b14"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "prost",
  "prost-build",
  "prost-types",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 84003aeeacc9..027aaba4845b 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -3833,9 +3833,9 @@ rec {
       };
       "fuse-backend-rs" = rec {
         crateName = "fuse-backend-rs";
-        version = "0.11.0";
+        version = "0.12.0";
         edition = "2018";
-        sha256 = "0jyldvp0kvjk21j5vqga42lkksaf7zg8jkj3l6h2dv20kyl66nif";
+        sha256 = "06yimnygx8k1mx7wgbs6fg8id346zgnanxbzdhx28rg1ra038rp1";
         libName = "fuse_backend_rs";
         authors = [
           "Liu Bo <bo.liu@linux.alibaba.com>"
@@ -3885,6 +3885,10 @@ rec {
             packageId = "nix 0.24.3";
           }
           {
+            name = "radix_trie";
+            packageId = "radix_trie";
+          }
+          {
             name = "vhost";
             packageId = "vhost";
             optional = true;
@@ -8876,11 +8880,11 @@ rec {
           }
           {
             name = "heck";
-            packageId = "heck 0.4.1";
+            packageId = "heck 0.5.0";
           }
           {
             name = "itertools";
-            packageId = "itertools 0.10.5";
+            packageId = "itertools 0.13.0";
             usesDefaultFeatures = false;
             features = [ "use_alloc" ];
           }
@@ -8972,7 +8976,7 @@ rec {
           }
           {
             name = "itertools";
-            packageId = "itertools 0.10.5";
+            packageId = "itertools 0.13.0";
           }
           {
             name = "proc-macro2";
@@ -9071,7 +9075,7 @@ rec {
         dependencies = [
           {
             name = "heck";
-            packageId = "heck 0.4.1";
+            packageId = "heck 0.5.0";
           }
           {
             name = "prost";
diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml
index 7387bf2424f2..16bf9c2dd99c 100644
--- a/tvix/Cargo.toml
+++ b/tvix/Cargo.toml
@@ -66,7 +66,7 @@ enum-primitive-derive = "0.3.0"
 erased-serde = "0.4.5"
 expect-test = "1.5.0"
 fastcdc = "3.1.0"
-fuse-backend-rs = "0.11.0"
+fuse-backend-rs = "0.12.0"
 futures = "0.3.30"
 genawaiter = { version = "0.99.1", default-features = false }
 glob = "0.3.1"
diff --git a/tvix/castore/src/fs/mod.rs b/tvix/castore/src/fs/mod.rs
index e700a25d3966..9c82b0a8c738 100644
--- a/tvix/castore/src/fs/mod.rs
+++ b/tvix/castore/src/fs/mod.rs
@@ -644,6 +644,7 @@ where
     ) -> io::Result<(
         Option<Self::Handle>,
         fuse_backend_rs::api::filesystem::OpenOptions,
+        Option<u32>,
     )> {
         if inode == ROOT_ID {
             return Err(io::Error::from_raw_os_error(libc::ENOSYS));
@@ -687,6 +688,7 @@ where
                         Ok((
                             Some(fh),
                             fuse_backend_rs::api::filesystem::OpenOptions::empty(),
+                            None,
                         ))
                     }
                 }