github/mergerfs
4
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-04-21 12:31:43 +00:00
Code Issues Releases Wiki Activity

enable nopath and nullpath_ok

Browse Source
This commit is contained in:
Antonio SJ Musumeci
2017-04-12 13:52:06 -04:00
parent 3c8afc1bb0
commit 162b99e6b8
21 changed files with 208 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/write.cpp
+3 -7
View File
@@ -72,9 +72,6 @@ _write_direct_io(const int fd,
return rv;
}
namespace mergerfs
{
namespace fuse
@@ -83,7 +80,6 @@ namespace mergerfs
inline
int
write(WriteFunc func,
const char *fusepath,
const char *buf,
const size_t count,
const off_t offset,
@@ -103,7 +99,7 @@ namespace mergerfs
const ugid::Set ugid(0,0);
const rwlock::ReadGuard readlock(&config.srcmountslock);
rv = fs::movefile(config.srcmounts,fusepath,count,fi->fd);
rv = fs::movefile(config.srcmounts,fi->fusepath,count,fi->fd);
if(rv == -1)
return -ENOSPC;
@@ -121,7 +117,7 @@ namespace mergerfs
off_t offset,
fuse_file_info *ffi)
{
return write(_write,fusepath,buf,count,offset,ffi);
return write(_write,buf,count,offset,ffi);
}
int
@@ -131,7 +127,7 @@ namespace mergerfs
off_t offset,
fuse_file_info *ffi)
{
return write(_write_direct_io,fusepath,buf,count,offset,ffi);
return write(_write_direct_io,buf,count,offset,ffi);
}
}
}