Skip to content

Commit 46b26bc

Browse files
committed
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 <[email protected]>
1 parent cd479f9 commit 46b26bc

File tree

1 file changed

+2
-7
lines changed
  • libcontainer/cgroups/fs

1 file changed

+2
-7
lines changed

libcontainer/cgroups/fs/fs.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,22 +298,17 @@ func (m *manager) Set(container *configs.Config) error {
298298

299299
// Freeze toggles the container's freezer cgroup depending on the state
300300
// provided
301-
func (m *manager) Freeze(state configs.FreezerState) (Err error) {
301+
func (m *manager) Freeze(state configs.FreezerState) error {
302302
path := m.Path("freezer")
303303
if m.cgroups == nil || path == "" {
304304
return errors.New("cannot toggle freezer: cgroups not configured for container")
305305
}
306306

307307
prevState := m.cgroups.Resources.Freezer
308308
m.cgroups.Resources.Freezer = state
309-
defer func() {
310-
if Err != nil {
311-
m.cgroups.Resources.Freezer = prevState
312-
}
313-
}()
314-
315309
freezer := &FreezerGroup{}
316310
if err := freezer.Set(path, m.cgroups); err != nil {
311+
m.cgroups.Resources.Freezer = prevState
317312
return err
318313
}
319314
return nil

0 commit comments

Comments
 (0)