octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-18 02:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1092 from liuyongqing/master

Browse Source 
fix coredump caused by fd_manager_lock locking
This commit is contained in:
Takeshi Nakatani 2019-07-15 04:53:10 +09:00 committed by GitHub
commit 850a813171
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fdcache.cpp
View File

@ -2125,7 +2125,7 @@ FdEntity* FdManager::Open(const char* path, headers_t* pmeta, off_t size, time_t
} }
bool close = false; bool close = false;
FdEntity* ent; FdEntity* ent;
{
AutoLock auto_lock(&FdManager::fd_manager_lock); AutoLock auto_lock(&FdManager::fd_manager_lock);
// search in mapping by key(path) // search in mapping by key(path)
@ -2178,7 +2178,6 @@ FdEntity* FdManager::Open(const char* path, headers_t* pmeta, off_t size, time_t
}else{ }else{
return NULL; return NULL;
} }
}
// open // open
if(0 != ent->Open(pmeta, size, time, no_fd_lock_wait)){ if(0 != ent->Open(pmeta, size, time, no_fd_lock_wait)){