Merge pull request #3374 from giuseppe/cgroups

cgroups: add initial support for cgroups v2

1 files changed, 3 insertions, 4 deletions

diff --git a/libpod/stats.go b/libpod/stats.go
index 926a1a511..e003f145b 100644
--- a/libpod/stats.go
+++ b/libpod/stats.go
@@ -7,8 +7,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/cgroups"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/cgroups"
 	"github.com/pkg/errors"
 )
 
@@ -34,14 +34,13 @@ func (c *Container) GetContainerStats(previousStats *ContainerStats) (*Container
 	if err != nil {
 		return nil, err
 	}
-	v1CGroups := GetV1CGroups(getExcludedCGroups())
-	cgroup, err := cgroups.Load(v1CGroups, cgroups.StaticPath(cgroupPath))
+	cgroup, err := cgroups.Load(cgroupPath)
 	if err != nil {
 		return stats, errors.Wrapf(err, "unable to load cgroup at %s", cgroupPath)
 	}
 
 	// Ubuntu does not have swap memory in cgroups because swap is often not enabled.
-	cgroupStats, err := cgroup.Stat(cgroups.IgnoreNotExist)
+	cgroupStats, err := cgroup.Stat()
 	if err != nil {
 		return stats, errors.Wrapf(err, "unable to obtain cgroup stats")
 	}