about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-10-27T12·40+0100
committerclbot <clbot@tvl.fyi>2024-10-27T14·29+0000
commite79815dda9ec26af4eeb4c6a5454ded90385da64 (patch)
tree2c804e7573bed579e44348eec3b158bb90b5b66b
parent057e4e3a997426434a8c511d237a6653c4927530 (diff)
fix(tvix/castore/fs): fix build for MacOS r/8867
fuse_backend_rs::api::filesystem::Layer is not exposed for non-Linux, and
feature-flagged on virtiofs, so only implement the trait for these cases.

Change-Id: Id8455dc5be502f8375836ba04288d50c59d69d89
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12693
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
-rw-r--r--tvix/castore/src/fs/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/tvix/castore/src/fs/mod.rs b/tvix/castore/src/fs/mod.rs
index 58e01355e96d..4f50868b8f44 100644
--- a/tvix/castore/src/fs/mod.rs
+++ b/tvix/castore/src/fs/mod.rs
@@ -24,7 +24,7 @@ use crate::{
 use bstr::ByteVec;
 use fuse_backend_rs::abi::fuse_abi::{stat64, OpenOptions};
 use fuse_backend_rs::api::filesystem::{
-    Context, FileSystem, FsOptions, GetxattrReply, Layer, ListxattrReply, ROOT_ID,
+    Context, FileSystem, FsOptions, GetxattrReply, ListxattrReply, ROOT_ID,
 };
 use futures::StreamExt;
 use parking_lot::RwLock;
@@ -300,7 +300,8 @@ const ROOT_NODES_BUFFER_SIZE: usize = 16;
 const XATTR_NAME_DIRECTORY_DIGEST: &[u8] = b"user.tvix.castore.directory.digest";
 const XATTR_NAME_BLOB_DIGEST: &[u8] = b"user.tvix.castore.blob.digest";
 
-impl<BS, DS, RN> Layer for TvixStoreFs<BS, DS, RN>
+#[cfg(all(feature = "virtiofs", target_os = "linux"))]
+impl<BS, DS, RN> fuse_backend_rs::api::filesystem::Layer for TvixStoreFs<BS, DS, RN>
 where
     BS: BlobService + Clone + Send + 'static,
     DS: DirectoryService + Send + Clone + 'static,