github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-22 10:16:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove duplicate entries in docs

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2023-04-01 14:02:19 -04:00
parent 7a62a629b9
commit cdcfef2ceb
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -289,8 +289,6 @@ These options are the same regardless of whether you use them with the
`async_read=true` instead.
* **sync_read**: deprecated - Perform reads synchronously. Use
`async_read=false` instead.
* **use_ino**: deprecated - Always enabled.
* **allow_other**: deprecated - Always enabled.
* **splice_read**: deprecated - Does nothing.
* **splice_write**: deprecated - Does nothing.
* **splice_move**: deprecated - Does nothing.

4
man/mergerfs.1
View File

@ -397,10 +397,6 @@ Use \f[C]async_read=true\f[R] instead.
\f[B]sync_read\f[R]: deprecated - Perform reads synchronously.
Use \f[C]async_read=false\f[R] instead.
.IP \[bu] 2
\f[B]use_ino\f[R]: deprecated - Always enabled.
.IP \[bu] 2
\f[B]allow_other\f[R]: deprecated - Always enabled.
.IP \[bu] 2
\f[B]splice_read\f[R]: deprecated - Does nothing.
.IP \[bu] 2
\f[B]splice_write\f[R]: deprecated - Does nothing.

21
src/option_parser.cpp
View File

@ -245,6 +245,8 @@ usage(void)
" -o [opt,...] mount options\n"
" -h --help print help\n"
" -v --version print version\n"
" -f run mergerfs in foreground\n"
" -d, -o debug enable debug output (enables -f)\n"
"\n"
"mergerfs options:\n"
" <branches> ':' delimited list of directories. Supports\n"
@ -253,18 +255,31 @@ usage(void)
" -o func.FUNC=POLICY Set function FUNC to policy POLICY\n"
" -o category.CAT=POLICY Set functions in category CAT to POLICY\n"
" -o fsname=STR Sets the name of the filesystem.\n"
" -o cache.open=INT 'open' policy cache timeout in seconds.\n"
" default = 0 (disabled)\n"
" -o read-thread-count=INT\n"
" Number of threads used to read from FUSE (and process)\n"
" * 0 = number of logical cores\n"
" * negative value = number of logical cores / abs(value)\n"
" * -1 in combination with process-thread-count=-1 will\n"
" split thread count among read and process threads\n"
" default=0\n"
" -o process-thread-count=INT\n"
" Same as read-thread-count but for FUSE message processing\n"
" If not set then read threads will do both read and process\n"
" -o cache.statfs=INT 'statfs' cache timeout in seconds. Used by\n"
" policies. default = 0 (disabled)\n"
" -o cache.files=libfuse|off|partial|full|auto-full\n"
" -o cache.files=libfuse|off|partial|full|auto-full|per-process\n"
" * libfuse: Use direct_io, kernel_cache, auto_cache\n"
" values directly\n"
" * off: Disable page caching\n"
" * partial: Clear page cache on file open\n"
" * full: Keep cache on file open\n"
" * auto-full: Keep cache if mtime & size not changed\n"
" * per-process: Enable caching for only for processes\n"
" which comm name match value in cache.files.process-names\n"
" default = libfuse\n"
" -o cache.files.process-names=STRLIST\n"
" Pipe delimited list of process comm names.\n"
" defulat=rtorrent|qbittorrent-nox\n"
" -o cache.writeback=BOOL\n"
" Enable kernel writeback caching (if supported)\n"
" cache.files must be enabled as well.\n"