Merge pull request #13668 from rhatdan/walk

Switch all calls to filepath.Walk to filepath.WalkDir

2 files changed, 25 insertions, 2 deletions

diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 334a44a88..b89978601 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -3,6 +3,7 @@ package util
 import (
 	"encoding/json"
 	"fmt"
+	"io/fs"
 	"math"
 	"os"
 	"os/user"
@@ -731,3 +732,20 @@ func LookupUser(name string) (*user.User, error) {
 	}
 	return user.Lookup(name)
 }
+
+// SizeOfPath determines the file usage of a given path. it was called volumeSize in v1
+// and now is made to be generic and take a path instead of a libpod volume
+func SizeOfPath(path string) (uint64, error) {
+	var size uint64
+	err := filepath.WalkDir(path, func(path string, d fs.DirEntry, err error) error {
+		if err == nil && !d.IsDir() {
+			info, err := d.Info()
+			if err != nil {
+				return err
+			}
+			size += uint64(info.Size())
+		}
+		return err
+	})
+	return size, err
+}
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go
index 1cffab19d..0b21bf3c5 100644
--- a/pkg/util/utils_linux.go
+++ b/pkg/util/utils_linux.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -23,17 +24,21 @@ func GetContainerPidInformationDescriptors() ([]string, error) {
 // Symlinks to nodes are ignored.
 func FindDeviceNodes() (map[string]string, error) {
 	nodes := make(map[string]string)
-	err := filepath.Walk("/dev", func(path string, info os.FileInfo, err error) error {
+	err := filepath.WalkDir("/dev", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			logrus.Warnf("Error descending into path %s: %v", path, err)
 			return filepath.SkipDir
 		}
 
 		// If we aren't a device node, do nothing.
-		if info.Mode()&(os.ModeDevice|os.ModeCharDevice) == 0 {
+		if d.Type()&(os.ModeDevice|os.ModeCharDevice) == 0 {
 			return nil
 		}
 
+		info, err := d.Info()
+		if err != nil {
+			return err
+		}
 		// We are a device node. Get major/minor.
 		sysstat, ok := info.Sys().(*syscall.Stat_t)
 		if !ok {