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

Merge pull request #278 from trapexit/ioctl-dir

Browse Source 
fix ioctl on directories
This commit is contained in:
Antonio SJ Musumeci 2016-05-11 13:12:50 -04:00
commit 68210d9252
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ioctl.cpp
View File

@ -20,8 +20,10 @@
#include <vector> #include <vector>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/fs.h> #include <sys/stat.h>
#include <sys/types.h>
#include "config.hpp" #include "config.hpp"
#include "fileinfo.hpp" #include "fileinfo.hpp"
@ -48,10 +50,6 @@ _ioctl(const int fd,
#ifdef FUSE_IOCTL_DIR #ifdef FUSE_IOCTL_DIR
#ifndef O_DIRECTORY
#define O_DIRECTORY 0
#endif
#ifndef O_NOATIME #ifndef O_NOATIME
#define O_NOATIME 0 #define O_NOATIME 0
#endif #endif
@ -76,7 +74,7 @@ _ioctl_dir_base(Policy::Func::Search searchFunc,
fs::path::make(basepaths[0],fusepath,fullpath); fs::path::make(basepaths[0],fusepath,fullpath);
const int flags = O_RDWR | O_NOATIME | O_DIRECTORY; const int flags = O_RDONLY | O_NOATIME | O_NONBLOCK;
fd = ::open(fullpath.c_str(),flags); fd = ::open(fullpath.c_str(),flags);
if(fd == -1) if(fd == -1)
return -errno; return -errno;