jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgroups/fs/Freeze: simplify 

In here, defer looks like an overkill, since the code is very simple and
we already have an error path.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-06-03 12:01:14 -07:00
parent cd479f9d14
commit 46b26bc05d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcontainer/cgroups/fs/fs.go
View File

@ -298,7 +298,7 @@ func (m *manager) Set(container *configs.Config) error {
// Freeze toggles the container's freezer cgroup depending on the state // Freeze toggles the container's freezer cgroup depending on the state
// provided // provided
func (m *manager) Freeze(state configs.FreezerState) (Err error) { func (m *manager) Freeze(state configs.FreezerState) error {
path := m.Path("freezer") path := m.Path("freezer")
if m.cgroups == nil || path == "" { if m.cgroups == nil || path == "" {
return errors.New("cannot toggle freezer: cgroups not configured for container") return errors.New("cannot toggle freezer: cgroups not configured for container")
@ -306,14 +306,9 @@ func (m *manager) Freeze(state configs.FreezerState) (Err error) {
prevState := m.cgroups.Resources.Freezer prevState := m.cgroups.Resources.Freezer
m.cgroups.Resources.Freezer = state m.cgroups.Resources.Freezer = state
defer func() {
if Err != nil {
m.cgroups.Resources.Freezer = prevState
}
}()
freezer := &FreezerGroup{} freezer := &FreezerGroup{}
if err := freezer.Set(path, m.cgroups); err != nil { if err := freezer.Set(path, m.cgroups); err != nil {
m.cgroups.Resources.Freezer = prevState
return err return err
} }
return nil return nil