github-mirror/mergerfs
github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-02-25 16:44:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #878 from trapexit/readdir_rewind_fix

Browse Source 
reset dentry buffer when rewind'ed
This commit is contained in:
trapexit 2021-02-09 20:21:59 -05:00 committed by GitHub
commit 39d98f1eac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fuse_readdir_linux.cpp
View File

@ -65,6 +65,8 @@ namespace l
uint64_t namelen; uint64_t namelen;
struct linux_dirent64 *d; struct linux_dirent64 *d;
fuse_dirents_reset(buf_);
buf = (char*)g_DENTS_BUF_POOL.alloc(); buf = (char*)g_DENTS_BUF_POOL.alloc();
if(buf == NULL) if(buf == NULL)
return -ENOMEM; return -ENOMEM;

2
src/fuse_readdir_plus_linux.cpp
View File

@ -70,6 +70,8 @@ namespace l
fuse_entry_t entry; fuse_entry_t entry;
struct linux_dirent64 *d; struct linux_dirent64 *d;
fuse_dirents_reset(buf_);
buf = (char*)g_DENTS_BUF_POOL.alloc(); buf = (char*)g_DENTS_BUF_POOL.alloc();
entry.nodeid = 0; entry.nodeid = 0;

2
src/fuse_readdir_plus_posix.cpp
View File

@ -71,6 +71,8 @@ namespace l
uint64_t namelen; uint64_t namelen;
fuse_entry_t entry; fuse_entry_t entry;
fuse_dirents_reset(buf_);
entry.nodeid = 0; entry.nodeid = 0;
entry.generation = 0; entry.generation = 0;
entry.entry_valid = entry_timeout_; entry.entry_valid = entry_timeout_;

2
src/fuse_readdir_posix.cpp
View File

@ -67,6 +67,8 @@ namespace l
string fullpath; string fullpath;
uint64_t namelen; uint64_t namelen;
fuse_dirents_reset(buf_);
for(const auto &branch : *branches_) for(const auto &branch : *branches_)
{ {
int rv; int rv;