From fa851eda3abeebd11f77210a6355c52b97c5b42e Mon Sep 17 00:00:00 2001 From: trapexit Date: Sun, 6 Jul 2025 18:31:47 -0500 Subject: [PATCH] Ensure passthrough and keep_cache are mutually exclusive (#1493) --- libfuse/lib/fuse.cpp | 2 +- src/option_parser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libfuse/lib/fuse.cpp b/libfuse/lib/fuse.cpp index b535c1b1..f2c93e2b 100644 --- a/libfuse/lib/fuse.cpp +++ b/libfuse/lib/fuse.cpp @@ -2373,7 +2373,7 @@ fuse_lib_open(fuse_req_t req, err = f->fs->op.open(path,&ffi); if(!err) { - if(ffi.auto_cache) + if(ffi.auto_cache && (ffi.passthrough == false)) open_auto_cache(f,hdr_->nodeid,path,&ffi); } } diff --git a/src/option_parser.cpp b/src/option_parser.cpp index 9eb62eae..643c7d6f 100644 --- a/src/option_parser.cpp +++ b/src/option_parser.cpp @@ -262,8 +262,8 @@ _postprocess_passthrough(Config::Write &cfg_) if(cfg_->cache_files == CacheFiles::ENUM::OFF) { SysLog::warning("'cache.files' can not be 'off' when using 'passthrough'." - " Setting 'cache.files=auto-full'"); - cfg_->cache_files = CacheFiles::ENUM::AUTO_FULL; + " Setting 'cache.files=full'"); + cfg_->cache_files = CacheFiles::ENUM::FULL; } if(cfg_->writeback_cache == true)