felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib: Use uint64 for disk stats (ref #3930) (#7019)

Browse Source
This commit is contained in:
Simon Frei
2020-10-02 15:22:28 +02:00
committed by GitHub
parent a20c6ca868
commit 48da6f0f22
6 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/config/folderconfiguration.go
+4 -7
View File
@@ -235,7 +235,7 @@ func (f *FolderConfiguration) SharedWith(device protocol.DeviceID) bool {
return false
}
func (f *FolderConfiguration) CheckAvailableSpace(req int64) error {
func (f *FolderConfiguration) CheckAvailableSpace(req uint64) error {
val := f.MinDiskFree.BaseValue()
if val <= 0 {
return nil
@@ -245,11 +245,8 @@ func (f *FolderConfiguration) CheckAvailableSpace(req int64) error {
if err != nil {
return nil
}
usage.Free -= req
if usage.Free > 0 {
if err := CheckFreeSpace(f.MinDiskFree, usage); err == nil {
return nil
}
if !checkAvailableSpace(req, f.MinDiskFree, usage) {
return fmt.Errorf("insufficient space in %v %v", fs.Type(), fs.URI())
}
return fmt.Errorf("insufficient space in %v %v", fs.Type(), fs.URI())
return nil
}