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

use stat/2 rather than statvfs/2 to find file drive

Browse Source
This commit is contained in:
Antonio SJ Musumeci
2016-02-23 12:06:16 -05:00
parent 476a8a50ea
commit 792c9b9808
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fs.cpp
+13 -12
View File
@@ -112,28 +112,29 @@ namespace fs
string &basepath)
{
int rv;
dev_t dev;
string fullpath;
unsigned long fsid;
struct statvfs buf;
struct stat st;
rv = ::fstatvfs(fd,&buf);
if(rv == -1)
rv = ::fstat(fd,&st);
if(FSTAT_FAILED(rv))
return -1;
fsid = buf.f_fsid;
dev = st.st_dev;
for(int i = 0, ei = srcmounts.size(); i != ei; i++)
{
fs::path::make(&srcmounts[i],fusepath,fullpath);
rv = ::statvfs(fullpath.c_str(),&buf);
if(rv == -1)
rv = ::lstat(fullpath.c_str(),&st);
if(FSTAT_FAILED(rv))
continue;
if(buf.f_fsid == fsid)
{
basepath = srcmounts[i];
return 0;
}
if(st.st_dev != dev)
continue;
basepath = srcmounts[i];
return 0;
}
return (errno=ENOENT,-1);