From 6943fc8dc18f2cb0f4978b025788e74c5151e968 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Mon, 2 Nov 2015 20:14:09 -0500 Subject: [PATCH] Remove unnecessary `Container.changes` function. Signed-off-by: David Calavera Upstream-commit: 6ea9a880dc434446c072ac23b1cab89ec3652140 Component: engine --- components/engine/daemon/changes.go | 4 +++- components/engine/daemon/container.go | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/components/engine/daemon/changes.go b/components/engine/daemon/changes.go index 0748fa9c02..181ac5a973 100644 --- a/components/engine/daemon/changes.go +++ b/components/engine/daemon/changes.go @@ -9,5 +9,7 @@ func (daemon *Daemon) ContainerChanges(name string) ([]archive.Change, error) { return nil, err } - return container.changes() + container.Lock() + defer container.Unlock() + return daemon.changes(container) } diff --git a/components/engine/daemon/container.go b/components/engine/daemon/container.go index 64883450cc..339585d4e0 100644 --- a/components/engine/daemon/container.go +++ b/components/engine/daemon/container.go @@ -286,12 +286,6 @@ func (container *Container) Resize(h, w int) error { return nil } -func (container *Container) changes() ([]archive.Change, error) { - container.Lock() - defer container.Unlock() - return container.daemon.changes(container) -} - func (container *Container) getImage() (*image.Image, error) { if container.daemon == nil { return nil, derr.ErrorCodeImageUnregContainer