Remove 'all' policy and simplify logic

This commit is contained in:
Antonio SJ Musumeci
2015-02-02 23:59:45 -05:00
parent 1f61a662ad
commit b411c63df1
26 changed files with 178 additions and 285 deletions
+4 -13
View File
@@ -45,24 +45,15 @@ _unlink(const fs::SearchFunc searchFunc,
const string &fusepath)
{
int rv;
int error;
fs::PathVector paths;
fs::Path path;
rv = searchFunc(srcmounts,fusepath,paths);
rv = searchFunc(srcmounts,fusepath,path);
if(rv == -1)
return -errno;
rv = -1;
error = 0;
for(fs::PathVector::const_iterator
i = paths.begin(), ei = paths.end(); i != ei; ++i)
{
rv &= ::unlink(i->full.c_str());
if(rv == -1)
error = errno;
}
rv = ::unlink(path.full.c_str());
return ((rv == -1) ? -error : 0);
return ((rv == -1) ? -errno : 0);
}
namespace mergerfs