octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-06-01 16:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1363 from gaul/is-modified-race

Browse Source 
Lock fdent_data_lock before accessing pagelist
This commit is contained in:
Takeshi Nakatani 2020-08-16 20:25:24 +09:00 committed by GitHub
commit 46acbf10ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fdcache.cpp
View File

@ -1788,6 +1788,12 @@ bool FdEntity::RenamePath(const string& newpath, string& fentmapkey)
return true;
}
bool FdEntity::IsModified(void) const
{
AutoLock auto_data_lock(const_cast<pthread_mutex_t *>(&fdent_data_lock));
return pagelist.IsModified();
}
bool FdEntity::GetStats(struct stat& st, bool lock_already_held)
{
AutoLock auto_lock(&fdent_lock, lock_already_held ? AutoLock::ALREADY_LOCKED : AutoLock::NONE);
@ -1882,6 +1888,7 @@ bool FdEntity::GetSize(off_t& size)
return false;
}
AutoLock auto_data_lock(&fdent_data_lock);
size = pagelist.Size();
return true;
}

2
src/fdcache.h
View File

@ -185,7 +185,7 @@ class FdEntity
const char* GetPath(void) const { return path.c_str(); }
bool RenamePath(const std::string& newpath, std::string& fentmapkey);
int GetFd(void) const { return fd; }
bool IsModified(void) const { return pagelist.IsModified(); }
bool IsModified(void) const;
bool MergeOrgMeta(headers_t& updatemeta);
bool GetStats(struct stat& st, bool lock_already_held = false);

1
src/s3fs_util.h
View File

@ -97,6 +97,7 @@ class AutoLock
~AutoLock();
private:
AutoLock(const AutoLock&);
pthread_mutex_t* const auto_mutex;
bool is_lock_acquired;
};