github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-02-08 14:42:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #203 from trapexit/mknod-fix

Browse Source 
fix indexing of mknod targets. closes #202
This commit is contained in:
Antonio SJ Musumeci 2016-01-20 17:27:19 -05:00
commit 091cc230d8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mkdir.cpp
View File

@ -47,9 +47,8 @@ _mkdir(Policy::Func::Search searchFunc,
int rv; int rv;
int error; int error;
string dirname; string dirname;
string fullpath; string existingpath;
vector<string> createpaths; vector<string> createpaths;
vector<string> existingpath;
dirname = fs::path::dirname(fusepath); dirname = fs::path::dirname(fusepath);
rv = searchFunc(srcmounts,dirname,minfreespace,existingpath); rv = searchFunc(srcmounts,dirname,minfreespace,existingpath);
@ -65,10 +64,10 @@ _mkdir(Policy::Func::Search searchFunc,
{ {
string &createpath = createpaths[i]; string &createpath = createpaths[i];
if(createpath != existingpath[0]) if(createpath != existingpath)
{ {
const ugid::SetRootGuard ugidGuard; const ugid::SetRootGuard ugidGuard;
fs::clonepath(existingpath[0],createpath,dirname); fs::clonepath(existingpath,createpath,dirname);
} }
fs::path::append(createpath,fusepath); fs::path::append(createpath,fusepath);

8
src/mknod.cpp
View File

@ -49,8 +49,8 @@ _mknod(Policy::Func::Search searchFunc,
int rv; int rv;
int error; int error;
string dirname; string dirname;
string existingpath;
vector<string> createpaths; vector<string> createpaths;
vector<string> existingpath;
dirname = fs::path::dirname(fusepath); dirname = fs::path::dirname(fusepath);
rv = searchFunc(srcmounts,dirname,minfreespace,existingpath); rv = searchFunc(srcmounts,dirname,minfreespace,existingpath);
@ -64,12 +64,12 @@ _mknod(Policy::Func::Search searchFunc,
error = -1; error = -1;
for(size_t i = 0, ei = createpaths.size(); i != ei; i++) for(size_t i = 0, ei = createpaths.size(); i != ei; i++)
{ {
string &createpath = createpaths[0]; string &createpath = createpaths[i];
if(createpath != existingpath[0]) if(createpath != existingpath)
{ {
const ugid::SetRootGuard ugidGuard; const ugid::SetRootGuard ugidGuard;
fs::clonepath(existingpath[0],createpath,dirname); fs::clonepath(existingpath,createpath,dirname);
} }
fs::path::append(createpath,fusepath); fs::path::append(createpath,fusepath);