rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert removal of readdir init setup, simplify cfg usage (#1520)
Some checks failed
CodeQL / Analyze (push) Has been cancelled
Details
mkdocs / deploy (push) Has been cancelled
Details

Browse source
This commit is contained in:
trapexit 2025-09-06 12:03:51 -04:00 • committed by GitHub
parent 99c28ad3bc
commit f64ff9ca1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 388 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/fuse_symlink.cpp
View file

@ -128,22 +128,21 @@ FUSE::symlink(const char *target_,
fuse_timeouts_t *timeouts_)
{
int rv;
Config::Read cfg;
const fuse_context *fc = fuse_get_context();
const ugid::Set ugid(fc->uid,fc->gid);
rv = ::_symlink(cfg->func.getattr.policy,
cfg->func.symlink.policy,
cfg->branches,
rv = ::_symlink(cfg.func.getattr.policy,
cfg.func.symlink.policy,
cfg.branches,
target_,
linkpath_,
st_);
if(rv == -EROFS)
{
Config::Write()->branches.find_and_set_mode_ro();
rv = ::_symlink(cfg->func.getattr.policy,
cfg->func.symlink.policy,
cfg->branches,
cfg.branches.find_and_set_mode_ro();
rv = ::_symlink(cfg.func.getattr.policy,
cfg.func.symlink.policy,
cfg.branches,
target_,
linkpath_,
st_);
@ -151,13 +150,13 @@ FUSE::symlink(const char *target_,
if(timeouts_ != NULL)
{
switch(cfg->follow_symlinks)
switch(cfg.follow_symlinks)
{
case FollowSymlinks::ENUM::NEVER:
timeouts_->entry = ((rv >= 0) ?
cfg->cache_entry :
cfg->cache_negative_entry);
timeouts_->attr = cfg->cache_attr;
cfg.cache_entry :
cfg.cache_negative_entry);
timeouts_->attr = cfg.cache_attr;
break;
default:
timeouts_->entry = 0;