From cae1dbee018b50a266376d7f32e04f37b4723932 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 25 Jan 2022 12:34:32 +0100 Subject: [PATCH] ImageService.ReleaseLayer(): remove unused containerOS argument This looks to be a leftover from LCOW. Signed-off-by: Sebastiaan van Stijn --- daemon/delete.go | 2 +- daemon/export.go | 4 ++-- daemon/images/service.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/delete.go b/daemon/delete.go index 57377c8b50..326f964cfe 100644 --- a/daemon/delete.go +++ b/daemon/delete.go @@ -116,7 +116,7 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, forceRemo // When container creation fails and `RWLayer` has not been created yet, we // do not call `ReleaseRWLayer` if container.RWLayer != nil { - err := daemon.imageService.ReleaseLayer(container.RWLayer, container.OS) + err := daemon.imageService.ReleaseLayer(container.RWLayer) if err != nil { err = errors.Wrapf(err, "container %s", container.ID) container.SetRemovalError(err) diff --git a/daemon/export.go b/daemon/export.go index 37d73499db..49fe778664 100644 --- a/daemon/export.go +++ b/daemon/export.go @@ -52,7 +52,7 @@ func (daemon *Daemon) containerExport(container *container.Container) (arch io.R } defer func() { if err != nil { - daemon.imageService.ReleaseLayer(rwlayer, container.OS) + daemon.imageService.ReleaseLayer(rwlayer) } }() @@ -73,7 +73,7 @@ func (daemon *Daemon) containerExport(container *container.Container) (arch io.R arch = ioutils.NewReadCloserWrapper(archv, func() error { err := archv.Close() rwlayer.Unmount() - daemon.imageService.ReleaseLayer(rwlayer, container.OS) + daemon.imageService.ReleaseLayer(rwlayer) return err }) daemon.LogContainerEvent(container, "export") diff --git a/daemon/images/service.go b/daemon/images/service.go index 85c3bd5d40..a3555e00d7 100644 --- a/daemon/images/service.go +++ b/daemon/images/service.go @@ -187,7 +187,7 @@ func (i *ImageService) GraphDriverName() string { // ReleaseLayer releases a layer allowing it to be removed // called from delete.go Daemon.cleanupContainer(), and Daemon.containerExport() -func (i *ImageService) ReleaseLayer(rwlayer layer.RWLayer, containerOS string) error { +func (i *ImageService) ReleaseLayer(rwlayer layer.RWLayer) error { metadata, err := i.layerStore.ReleaseRWLayer(rwlayer) layer.LogReleaseMetadata(metadata) if err != nil && !errors.Is(err, layer.ErrMountDoesNotExist) && !errors.Is(err, os.ErrNotExist) {