Merge pull request openshift#80 from rjnagal/cgroup-cleanup

Change checks for non-existent cgroup file to a more concise form.
pmorie · Jul 9, 2014 · c427473 · c427473
2 parents 46e34cf + dceaa2e
commit c427473
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/cgroups/fs/blkio.go b/cgroups/fs/blkio.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/docker/libcontainer/cgroups"
 )
@@ -66,7 +65,7 @@ func getBlkioStat(path string) ([]cgroups.BlkioStatEntry, error) {
 	var blkioStats []cgroups.BlkioStatEntry
 	f, err := os.Open(path)
 	if err != nil {
-		if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.ENOENT {
+		if os.IsNotExist(err) {
 			return blkioStats, nil
 		}
 		return nil, err

diff --git a/cgroups/fs/cpu.go b/cgroups/fs/cpu.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"syscall"
 
 	"github.com/docker/libcontainer/cgroups"
 )
@@ -50,7 +49,7 @@ func (s *cpuGroup) GetStats(d *data, stats *cgroups.Stats) error {
 
 	f, err := os.Open(filepath.Join(path, "cpu.stat"))
 	if err != nil {
-		if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.ENOENT {
+		if os.IsNotExist(err) {
 			return nil
 		}
 		return err

diff --git a/cgroups/fs/memory.go b/cgroups/fs/memory.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"syscall"
 
 	"github.com/docker/libcontainer/cgroups"
 )
@@ -61,7 +60,7 @@ func (s *memoryGroup) GetStats(d *data, stats *cgroups.Stats) error {
 	// Set stats from memory.stat.
 	statsFile, err := os.Open(filepath.Join(path, "memory.stat"))
 	if err != nil {
-		if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.ENOENT {
+		if os.IsNotExist(err) {
 			return nil
 		}
 		return err