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

Fix loading readonly / write once options from file

Browse source
This commit is contained in:
Antonio SJ Musumeci 2023-03-19 23:15:11 -04:00
parent d9033b7713
commit 1c5b0f2f5f
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/config.cpp
View file

@ -63,10 +63,13 @@ namespace l
IFERT("mount");
IFERT("nullrw");
IFERT("pid");
IFERT("pin-threads");
IFERT("process-thread-count");
IFERT("read-thread-count");
IFERT("readdirplus");
IFERT("scheduling-priority");
IFERT("threads");
IFERT("version");
IFERT("scheduling-priority");
return false;
}
@ -118,9 +121,11 @@ Config::Config()
symlinkify_timeout(3600),
fuse_read_thread_count(-1),
fuse_process_thread_count(-1),
fuse_pin_threads("false"),
version(MERGERFS_VERSION),
writeback_cache(false),
xattr(XAttr::ENUM::PASSTHROUGH)
xattr(XAttr::ENUM::PASSTHROUGH),
_initialized(false)
{
_map["async_read"] = &async_read;
_map["auto_cache"] = &auto_cache;
@ -176,6 +181,7 @@ Config::Config()
_map["nfsopenhack"] = &nfsopenhack;
_map["nullrw"] = &nullrw;
_map["pid"] = &pid;
_map["pin-threads"] = &fuse_pin_threads;
_map["posix_acl"] = &posix_acl;
_map["readahead"] = &readahead;
// _map["readdir"] = &readdir;
@ -287,7 +293,7 @@ int
Config::set(const std::string &key_,
const std::string &value_)
{
if(l::readonly(key_))
if(_initialized && l::readonly(key_))
return -EROFS;
return set_raw(key_,value_);
@ -362,6 +368,12 @@ Config::from_file(const std::string &filepath_,
return rv;
}
void
Config::finish_initializing()
{
_initialized = true;
}
std::ostream&
operator<<(std::ostream &os_,
const Config &c_)