octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-11 00:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always hold lock when accessing free_disk_space

Browse Source 
Slightly reorder locks to avoid double locking.  Found via
ThreadSanitizer.
This commit is contained in:
Andrew Gaul 2019-07-29 15:23:57 -07:00
parent 80972aa33d
commit 5b15c7c4e9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fdcache.cpp
View File

@ -1986,8 +1986,15 @@ bool FdManager::CheckCacheDirExist()
return true; return true;
} }
off_t FdManager::GetEnsureFreeDiskSpace()
{
AutoLock auto_lock(&FdManager::reserved_diskspace_lock);
return FdManager::free_disk_space;
}
off_t FdManager::SetEnsureFreeDiskSpace(off_t size) off_t FdManager::SetEnsureFreeDiskSpace(off_t size)
{ {
AutoLock auto_lock(&FdManager::reserved_diskspace_lock);
off_t old = FdManager::free_disk_space; off_t old = FdManager::free_disk_space;
FdManager::free_disk_space = size; FdManager::free_disk_space = size;
return old; return old;
@ -2342,8 +2349,8 @@ void FdManager::CleanupCacheDirInternal(const std::string &path)
bool FdManager::ReserveDiskSpace(off_t size) bool FdManager::ReserveDiskSpace(off_t size)
{ {
AutoLock auto_lock(&FdManager::reserved_diskspace_lock);
if(IsSafeDiskSpace(NULL, size)){ if(IsSafeDiskSpace(NULL, size)){
AutoLock auto_lock(&FdManager::reserved_diskspace_lock);
free_disk_space += size; free_disk_space += size;
return true; return true;
} }

2
src/fdcache.h
View File

@ -221,7 +221,7 @@ class FdManager
static bool SetCheckCacheDirExist(bool is_check); static bool SetCheckCacheDirExist(bool is_check);
static bool CheckCacheDirExist(void); static bool CheckCacheDirExist(void);
static off_t GetEnsureFreeDiskSpace(void) { return FdManager::free_disk_space; } static off_t GetEnsureFreeDiskSpace();
static off_t SetEnsureFreeDiskSpace(off_t size); static off_t SetEnsureFreeDiskSpace(off_t size);
static bool IsSafeDiskSpace(const char* path, off_t size); static bool IsSafeDiskSpace(const char* path, off_t size);
static void FreeReservedDiskSpace(off_t size); static void FreeReservedDiskSpace(off_t size);