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

stop clonepath at base directory. fixes #467

Browse source
This commit is contained in:
Antonio SJ Musumeci 2018-03-07 18:24:47 -05:00
parent 62ae871d51
commit f48c16d162
14 changed files with 238 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/create.cpp
View file

@ -34,7 +34,6 @@ using std::vector;
using namespace mergerfs;
static
inline
int
_create_core(const string &fullpath,
mode_t mode,
@ -49,10 +48,8 @@ _create_core(const string &fullpath,
static
int
_create_core(const string &existingpath,
const string &createpath,
_create_core(const string &createpath,
const char *fusepath,
const char *fusedirpath,
const mode_t mode,
const mode_t umask,
const int flags,
@ -61,14 +58,6 @@ _create_core(const string &existingpath,
int rv;
string fullpath;
if(createpath != existingpath)
{
const ugid::SetRootGuard ugidGuard;
rv = fs::clonepath(existingpath,createpath,fusedirpath);
if(rv == -1)
return -errno;
}
fs::path::make(&createpath,fusepath,fullpath);
rv = _create_core(fullpath,mode,umask,flags);
@ -111,8 +100,12 @@ _create(Policy::Func::Search searchFunc,
if(rv == -1)
return -errno;
return _create_core(*existingpaths[0],*createpaths[0],
fusepath,fusedirpathcstr,
rv = fs::clonepath_as_root(*existingpaths[0],*createpaths[0],fusedirpath);
if(rv == -1)
return -errno;
return _create_core(*createpaths[0],
fusepath,
mode,umask,flags,fh);
}