apply feedback

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Feb 18, 2021 · b7564d3 · b7564d3
1 parent d080ab3
commit b7564d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -1763,7 +1763,6 @@ func (s *svc) PurgeRecycle(ctx context.Context, req *gateway.PurgeRecycleRequest
 }
 
 func (s *svc) GetQuota(ctx context.Context, req *gateway.GetQuotaRequest) (*provider.GetQuotaResponse, error) {
-	// lookup storage by treating the key as a path. It has been prefixed with the storage path in ListRecycle
 	c, err := s.find(ctx, req.Ref)
 	if err != nil {
 		return &provider.GetQuotaResponse{

diff --git a/pkg/storage/fs/ocis/ocis.go b/pkg/storage/fs/ocis/ocis.go
@@ -225,7 +225,7 @@ func (fs *ocisfs) GetQuota(ctx context.Context) (uint64, uint64, error) {
 		return 0, 0, err
 	}
 
-	total := +ri.Size + (stat.Bavail * uint64(stat.Bsize)) // used treesize + available space
+	total := ri.Size + (stat.Bavail * uint64(stat.Bsize)) // used treesize + available space
 
 	switch {
 	case quotaStr == _quotaUncalculated, quotaStr == _quotaUnknown, quotaStr == _quotaUnlimited:

diff --git a/pkg/storage/utils/localfs/localfs.go b/pkg/storage/utils/localfs/localfs.go
@@ -511,8 +511,8 @@ func (fs *localfs) GetQuota(ctx context.Context) (uint64, uint64, error) {
 	if err != nil {
 		return 0, 0, err
 	}
-	total := stat.Blocks * uint64(stat.Bsize) // Total data blocks in filesystem
-	used := stat.Bavail * uint64(stat.Bsize)  // Free blocks available to	unprivileged user
+	total := stat.Blocks * uint64(stat.Bsize)                // Total data blocks in filesystem
+	used := (stat.Blocks - stat.Bavail) * uint64(stat.Bsize) // Free blocks available to unprivileged user
 	return total, used, nil
 }