diff --git a/cgroups/fs/apply_raw.go b/cgroups/fs/apply_raw.go index 1b0798705..f37d83748 100644 --- a/cgroups/fs/apply_raw.go +++ b/cgroups/fs/apply_raw.go @@ -304,6 +304,10 @@ func removePath(p string, err error) error { func CheckCpushares(path string, c int64) error { var cpuShares int64 + if c == 0 { + return nil + } + fd, err := os.Open(filepath.Join(path, "cpu.shares")) if err != nil { return err @@ -314,12 +318,11 @@ func CheckCpushares(path string, c int64) error { if err != nil && err != io.EOF { return err } - if c != 0 { - if c > cpuShares { - return fmt.Errorf("The maximum allowed cpu-shares is %d", cpuShares) - } else if c < cpuShares { - return fmt.Errorf("The minimum allowed cpu-shares is %d", cpuShares) - } + + if c > cpuShares { + return fmt.Errorf("The maximum allowed cpu-shares is %d", cpuShares) + } else if c < cpuShares { + return fmt.Errorf("The minimum allowed cpu-shares is %d", cpuShares) } return nil