github/mergerfs
4
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-20 00:17:43 +00:00
Code Issues Releases Wiki Activity
1,592 Commits 60 Branches 98 Tags
master
Commit Graph
531 Commits
Author SHA1 Message Date
trapexit 2412ae7316 Further tweaks to config parsing and error reporting (#1559) 
* Further tweaks to config parsing and error reporting

* Fix static builds
 2025-11-01 15:20:30 -05:00
trapexit 37f10888a9 Add more debugging options to makefiles and cleanup (#1556) 2025-10-29 22:42:42 -05:00
trapexit cfaad60275 Misc updates to arg parsing (#1554) 
Ignore "defaults" and add a number of more modern VFS mount switches
 2025-10-26 21:05:05 -05:00
trapexit 077484323c Fix variable names of fuse-msg-size and posix-acl (#1553) 2025-10-25 17:00:16 -05:00
trapexit 727c522fb8 Rework config, centralize fuse config (#1547) 2025-10-24 08:20:29 -05:00
trapexit 0371f03def Rework how fuse request context is handled (#1543) 2025-10-12 23:21:36 -05:00
trapexit 0f24bb29ac Make allow-idmap optional (default: false) (#1541) 
This is just to correct default behavior for now. More investigation
is necessary to properly support idmapping.
 2025-10-06 14:46:58 -05:00
trapexit 3cb35a3a65 Fix rename path generation (#1540) 2025-10-01 17:47:13 -05:00
trapexit 46f85c0f6d Misc fixes, mostly for FreeBSD (#1536) 2025-09-28 23:17:51 -05:00
trapexit 7a9c3b7eb2 Remove need for and use of ioprio header (#1535) 2025-09-28 00:01:26 -05:00
trapexit 569a151da2 Add ability to proxy ioprio of client apps (#1534) 2025-09-26 11:36:56 -05:00
trapexit 2f3e807e9d Add getdents based readdir functions for Linux (#1533) 2025-09-23 23:51:21 -05:00
trapexit ca59ae53a5 idmap mount support (#1523) 
* Add idmap mount support

* Further replacement of std::filesystem::path to fs::path

* Update docs regarding idmap support
 2025-09-18 00:07:28 -05:00
trapexit 8c649d33ee Start using std::filesystem::path for fusepath (#1522) 2025-09-17 22:51:16 -05:00
trapexit f64ff9ca1e Revert removal of readdir init setup, simplify cfg usage (#1520) 2025-09-06 11:03:51 -05:00
trapexit d7549f8d53 Fix string manipulation functions after refactor (#1514) 2025-08-22 19:42:31 -05:00
trapexit 6ac7f389c5 Misc changes (#1513) 
* Start moving to string_view where possible
* Rework readdir object to use atomic load/store
 2025-08-21 22:42:58 -05:00
Max.-F. HelmandMax-F-Helm dd1bea52cd Allow empty lines in config ini files (#1509) 
* Allow empty lines in config files

* Add example comment to ini example in docs/quickstart.md

---------

Co-authored-by: Max-F-Helm <m7t24zklr@relay.firefox.com>
 2025-08-13 20:00:05 -05:00
trapexit df19f99976 Fix constructing string from attrval setxattr config (#1508) 2025-08-11 19:50:12 -05:00
trapexit 4439c2a030 Add setting of oom_score_adj (#1504) 
To limit risk of killing by OOM Killer.
 2025-08-07 23:58:06 -05:00
trapexit b18aba86b6 Build improvements (#1501) 
* Remove python dependency
* Remove ecfd
* Improve makefiles
* Make preload.so more 32bit compatible
 2025-08-04 23:39:52 -05:00
trapexit 33fc26f81f Cleanup copy functions (#1500) 2025-07-27 16:23:45 -05:00
trapexit e8cd74cab0 Move everything to negative errno return types (#1499) 2025-07-25 17:53:48 -05:00
trapexit 2b500f194a Rework of runtime interface (#1498) 
Also have special error handling for when branches are invalid and
ENOENT would be returned for getattr and readdir so users understand
what is going on and the runtime interface can still be used to fix
the problem.
 2025-07-21 18:18:59 -05:00
trapexit e87867cd2a Clear O_NOFOLLOW when opening a relative fd (#1494) 2025-07-08 18:25:00 -05:00
trapexit fa851eda3a Ensure passthrough and keep_cache are mutually exclusive (#1493) 2025-07-06 18:31:47 -05:00
trapexit f852474073 Update the secondary group cache (#1492) 
* Use concurrent_flat_map to build a global cache rather than per
thread.
* Create global maintanence thread manager for clearing unused cache
entries.
 2025-07-05 17:05:53 -05:00
trapexit 9e626228be Add mergerfs.collect-info (#1491) 
A tool to collect info for support requests.
 2025-07-03 20:18:05 -05:00
trapexit e216a81a27 Rework movefile and cow break to use copyfile (#1488) 2025-06-28 17:27:40 -05:00
trapexit 264c5600f8 Misc cleanup (#1486) 
* Skip non-directories when loading branches
* Warn if branch doesn't exist
* Add braces to globbing
 2025-06-25 22:43:49 -05:00
trapexit be49dbe1bd Remove linux only getdents in favor of readdir for FreeBSD sake (#1485) 2025-06-24 19:31:40 -05:00
trapexit eb124316c9 Set default read thread count to 0 (#1484) 2025-06-23 22:39:42 -05:00
trapexit 77ef88b04c Add fsck.mergerfs tool (#1483) 2025-06-23 21:57:55 -05:00
trapexit 095fcf82a3 Misc doc updates 2025-06-08 23:59:17 -05:00
trapexit 1b167d34d8 Spawn "mount" on branches when waiting for mounts enabled 2025-06-08 15:09:47 -05:00
trapexit 23824eaeb4 Misc cleanup 2025-06-06 19:10:19 -05:00
trapexit e310d24615 Add support for FUSE passthrough 2025-06-05 23:47:42 -05:00
trapexit 92312c8507 Add debugging of mutexes (#1470) 
When DEBUG defined it will used timed locks which will log when held
too long along with where.
 2025-05-26 00:44:39 -05:00
trapexit 4b751c2d37 Fix incorrect dyn cast (#1467) 2025-05-19 22:46:55 -05:00
trapexit 86b50d2d4e Rework policies to return branches rather than path strings 2025-05-17 16:35:18 -05:00
trapexit fa3266ca7f Add podman release build tooling + misc build fixes (#1455) 2025-05-08 00:00:53 -05:00
trapexit 344014aa81 Rework thread pool for increased stability + config and doc updates (#1453) 
Also updates fmt to 11.2.0 and replaced syslog usage with a wrapper
leveraging fmt.
 2025-05-05 18:28:49 -05:00
Antonio SJ Musumeci 2b04a791b7 Add config option to control default_permissions 
Defaults true but there might be some situations where it is useful to
disable.
 2025-04-25 16:34:39 -05:00
Antonio SJ Musumeci de2a82800a Improve mount waiting + misc doc improvements 
Adds user.mergerfs.branch and user.mergerfs.branch_mounts_here
Adds .mergerfs.branch and .mergerfs.branch_mounts_here files.
 2025-04-23 15:58:36 -05:00
Antonio SJ Musumeci 77bf16e9ae Change the "devino" inode calculation 
Use hashing of branch path rather than use st_dev.
 2025-04-15 18:54:51 -05:00
Antonio SJ Musumeci 80085c9844 Add statx support 2025-04-04 22:23:16 -05:00
Antonio SJ Musumeci f74dc36e92 Replace usage of wyhash with rapidhash 
https://github.com/Nicoshev/rapidhash
 2025-03-30 17:57:20 -05:00
Antonio SJ Musumeci b7f7f7fa97 Change misc defaults 
* category.create=pfrd
* moveonenospc=pfrd
* cache.files=off
* parallel-direct-writes=true

These changes were made to match the recommended settings for most
users to reduce confusion.
 2025-03-30 17:22:38 -05:00
Antonio SJ Musumeci 92ae63e842 Support Linux v6.13 FUSE max_page_limit 2025-03-30 00:07:08 -05:00
Antonio SJ Musumeci b83bd5fd14 Improve FreeBSD compatibility 
First draft. Need to investigate why upstream patches include certain
function that appear to exist in FreeBSD 14.2.
 2025-01-15 22:10:02 -06:00