cgroups: rename function to readCgroupMapPath

the same format is used on cgroup v1, so no need to specify the
version in the function name.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Author: giuseppe

pkg/cgroups/cgroups.go

@@ -582,7 +582,7 @@ func (c *CgroupControl) Stat() (*Metrics, error) {
 	return &m, nil
 }
 
-func readCgroup2MapPath(path string) (map[string][]string, error) {
+func readCgroupMapPath(path string) (map[string][]string, error) {
 	ret := map[string][]string{}
 	f, err := os.Open(path)
 	if err != nil {
@@ -610,5 +610,5 @@ func readCgroup2MapPath(path string) (map[string][]string, error) {
 func readCgroup2MapFile(ctr *CgroupControl, name string) (map[string][]string, error) {
 	p := filepath.Join(cgroupRoot, ctr.path, name)
 
-	return readCgroup2MapPath(p)
+	return readCgroupMapPath(p)
 }

pkg/cgroups/cgroups_linux.go

@@ -542,7 +542,7 @@ func (c *CgroupControl) Stat() (*cgroups.Stats, error) {
 	return &m, nil
 }
 
-func readCgroup2MapPath(path string) (map[string][]string, error) {
+func readCgroupMapPath(path string) (map[string][]string, error) {
 	ret := map[string][]string{}
 	f, err := os.Open(path)
 	if err != nil {
@@ -570,5 +570,5 @@ func readCgroup2MapPath(path string) (map[string][]string, error) {
 func readCgroup2MapFile(ctr *CgroupControl, name string) (map[string][]string, error) {
 	p := filepath.Join(cgroupRoot, ctr.config.Path, name)
 
-	return readCgroup2MapPath(p)
+	return readCgroupMapPath(p)
 }

pkg/cgroups/utils.go

@@ -64,7 +64,7 @@ func GetSystemCPUUsage() (uint64, error) {
 		}
 		p := filepath.Join(cgroupRoot, file.Name(), "cpu.stat")
 
-		values, err := readCgroup2MapPath(p)
+		values, err := readCgroupMapPath(p)
 		if err != nil {
 			return 0, err
 		}