Merge pull request docker-archive#338 from avagin/fixes

Mrunal Patel · Mrunal Patel · commit eb74393a3d2d · 2015-01-19T09:33:08.000-08:00
cgroups: set a freezer state before calling FreezerGroup.Set()
diff --git a/cgroups/fs/apply_raw.go b/cgroups/fs/apply_raw.go
@@ -124,14 +124,16 @@ func Freeze(c *cgroups.Cgroup, state cgroups.FreezerState) error {
 		return err
 	}
 
+	prevState := c.Freezer
+	c.Freezer = state
+
 	freezer := subsystems["freezer"]
 	err = freezer.Set(d)
 	if err != nil {
+		c.Freezer = prevState
 		return err
 	}
 
-	c.Freezer = state
-
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,14 +124,16 @@ func Freeze(c *cgroups.Cgroup, state cgroups.FreezerState) error {`
`124`	`124`	`return err`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ prevState := c.Freezer`
	`128`	`+ c.Freezer = state`
	`129`	`+`
`127`	`130`	`freezer := subsystems["freezer"]`
`128`	`131`	`err = freezer.Set(d)`
`129`	`132`	`if err != nil {`
	`133`	`+ c.Freezer = prevState`
`130`	`134`	`return err`
`131`	`135`	`}`
`132`	`136`
`133`		`- c.Freezer = state`
`134`		`-`
`135`	`137`	`return nil`
`136`	`138`	`}`
`137`	`139`