From 077484323c34e7ef13f58a0dabbdd2740558fc27 Mon Sep 17 00:00:00 2001 From: trapexit Date: Sat, 25 Oct 2025 17:00:16 -0500 Subject: [PATCH] Fix variable names of fuse-msg-size and posix-acl (#1553) --- mkdocs/docs/config/deprecated_options.md | 18 +++++++++--------- mkdocs/docs/faq/usage_and_functionality.md | 2 +- mkdocs/docs/performance.md | 11 +++++------ src/config.cpp | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/mkdocs/docs/config/deprecated_options.md b/mkdocs/docs/config/deprecated_options.md index 24759672..75004900 100644 --- a/mkdocs/docs/config/deprecated_options.md +++ b/mkdocs/docs/config/deprecated_options.md @@ -5,19 +5,19 @@ function or have been replaced. **They should not be used.** * **allow_other**: mergerfs v2.35.0 and above sets this FUSE option automatically if running as root. -* **async_read**: Use `async_read=true`. +* **async_read**: Use `async-read=true`. * **atomic_o_trunc**: Does nothing. * **big_writes**: Does nothing. -* **attr_timeout**: Use `cache.attr`. -* **auto_cache**: Use `cache.files=auto-full`. -* **direct_io**: Use `cache.files=off`. -* **entry_timeout**: Use `cache.entry`. +* **attr_timeout**: Use [cache.attr](cache.md). +* **auto_cache**: Use [cache.files=auto-full](cache.md). +* **direct_io**: Use [cache.files=off](cache.md). +* **entry_timeout**: Use [cache.entry](cache.md). * **hard_remove**: Does nothing. -* **kernel_cache**: Use `cache.files=full`. -* **negative_entry**: Use `cache.negative_entry`. +* **kernel_cache**: Use [cache.files=full](cache.md). +* **negative_entry**: Use [cache.negative-entry](cache.md). * **nonempty**: Does nothing. * **splice_move**: Does nothing. * **splice_read**: Does nothing. * **splice_write**: Does nothing. -* **sync_read**: Use `async_read=false`. -* **use_ino**: Use `inodecalc`. +* **sync_read**: Use `async-read=false`. +* **use_ino**: Use [inodecalc](inodecalc.md). diff --git a/mkdocs/docs/faq/usage_and_functionality.md b/mkdocs/docs/faq/usage_and_functionality.md index 343e25c6..44203e95 100644 --- a/mkdocs/docs/faq/usage_and_functionality.md +++ b/mkdocs/docs/faq/usage_and_functionality.md @@ -105,7 +105,7 @@ normal conditions. Keep in mind that if out-of-band changes are made while also leveraging any caching of the filesystem layout such as with -`cache.entry`, `cache.negative_entry`, `cache.attr`, `cache.symlinks`, +`cache.entry`, `cache.negative-entry`, `cache.attr`, `cache.symlinks`, or `cache.readdir` you may experience temporary inconsistency till the cache expires. mergerfs is not actively watching all branches for changes and the kernel will have no way to know anything changed so as diff --git a/mkdocs/docs/performance.md b/mkdocs/docs/performance.md index ff7854ed..3b26bd22 100644 --- a/mkdocs/docs/performance.md +++ b/mkdocs/docs/performance.md @@ -24,23 +24,22 @@ before changing them to understand how functionality will change. * test theoretical performance using `nullrw` or using a ram disk as a branch -* enable [passthrough](config/passthrough.md) (likely to have the +* enable [passthrough.io](config/passthrough.md) (likely to have the biggest impact) * change read or process [thread pools](config/threads.md) * toggle [func.readdir](config/func_readdir.md) * increase [readahead](config/readahead.md): `readahead=1024` -* disable `security_capability` and/or [xattr](config/xattr.md) +* disable `security-capability` and/or [xattr](config/xattr.md) * increase cache timeouts [cache.attr](config/cache.md#cacheattr), [cache.entry](config/cache.md#cacheentry), - [cache.negative_entry](config/cache.md#cachenegative-entry) + [cache.negative-entry](config/cache.md#cachenegative-entry) * toggle [page caching](config/cache.md#cachefiles) * enable `parallel-direct-writes` -* enable [cache.writeback](config/cache.md#cachewriteback) * enable [cache.statfs](config/cache.md#cachestatfs) * enable [cache.symlinks](config/cache.md#cachesymlinks) * enable [cache.readdir](config/cache.md#cachereaddir) -* disable `posix_acl` -* disable `async_read` +* disable `posix-acl` +* disable `async-read` * use [symlinkify](config/symlinkify.md) if your data is largely static and read-only * use [tiered cache](extended_usage_patterns.md) devices diff --git a/src/config.cpp b/src/config.cpp index 73667e01..4382a284 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -240,7 +240,7 @@ Config::Config() _map["func.truncate"] = &func.truncate; _map["func.unlink"] = &func.unlink; _map["func.utimens"] = &func.utimens; - _map["fuse_msg_size"] = &fuse_msg_size; + _map["fuse-msg-size"] = &fuse_msg_size; _map["gid"] = &gid; _map["gid-cache.expire-timeout"] = &gid_cache_expire_timeout; _map["gid-cache.remove-timeout"] = &gid_cache_remove_timeout; @@ -272,7 +272,7 @@ Config::Config() _map["passthrough.max-stack-depth"] = &passthrough_max_stack_depth; _map["pid"] = &pid; _map["pin-threads"] = &pin_threads; - _map["posix_acl"] = &posix_acl; + _map["posix-acl"] = &posix_acl; _map["process-thread-count"] = &process_thread_count; _map["process-thread-queue-depth"] = &process_thread_queue_depth; _map["proxy-ioprio"] = &proxy_ioprio;