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

Merge pull request #636 from swt2c/macos_upload_failures

Browse Source 
Fix intermittent upload failures on macOS
This commit is contained in:
Takeshi Nakatani 2017-09-17 15:23:48 +09:00 committed by GitHub
commit 7c5fba9890
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fdcache.cpp
View File

@ -1908,7 +1908,7 @@ size_t FdManager::SetEnsureFreeDiskSpace(size_t size)
return old; return old;
} }
fsblkcnt_t FdManager::GetFreeDiskSpace(const char* path) uint64_t FdManager::GetFreeDiskSpace(const char* path)
{ {
struct statvfs vfsbuf; struct statvfs vfsbuf;
string ctoppath; string ctoppath;
@ -1930,12 +1930,12 @@ fsblkcnt_t FdManager::GetFreeDiskSpace(const char* path)
S3FS_PRN_ERR("could not get vfs stat by errno(%d)", errno); S3FS_PRN_ERR("could not get vfs stat by errno(%d)", errno);
return 0; return 0;
} }
return (vfsbuf.f_bavail * vfsbuf.f_bsize); return (vfsbuf.f_bavail * vfsbuf.f_frsize);
} }
bool FdManager::IsSafeDiskSpace(const char* path, size_t size) bool FdManager::IsSafeDiskSpace(const char* path, size_t size)
{ {
fsblkcnt_t fsize = FdManager::GetFreeDiskSpace(path); uint64_t fsize = FdManager::GetFreeDiskSpace(path);
return ((size + FdManager::GetEnsureFreeDiskSpace()) <= fsize); return ((size + FdManager::GetEnsureFreeDiskSpace()) <= fsize);
} }

2
src/fdcache.h
View File

@ -194,7 +194,7 @@ class FdManager
fdent_map_t fent; fdent_map_t fent;
private: private:
static fsblkcnt_t GetFreeDiskSpace(const char* path); static uint64_t GetFreeDiskSpace(const char* path);
void CleanupCacheDirInternal(const std::string &path = ""); void CleanupCacheDirInternal(const std::string &path = "");
public: public: