@@ -53,14 +53,14 @@ type containerFSView struct {

 }

 // openContainerFS opens a new view of the container's filesystem.

-func (daemon *Daemon) openContainerFS(ctr *container.Container) (_ *containerFSView, err error) {

+func (daemon *Daemon) openContainerFS(ctr *container.Container) (_ *containerFSView, retErr error) {

 	ctx := context.TODO()

 	if err := daemon.Mount(ctr); err != nil {

 		return nil, err

 	}

 	defer func() {

-		if err != nil {

+		if retErr != nil {

 			_ = daemon.Unmount(ctr)

 		}

 	}()

@@ -72,7 +72,7 @@ func (daemon *Daemon) openContainerFS(ctr *container.Container) (_ *containerFSV

 	defer func() {

 		ctx := context.WithoutCancel(ctx)

 		cleanup(ctx)

-		if err != nil {

+		if retErr != nil {

 			_ = ctr.UnmountVolumes(ctx, daemon.LogVolumeEvent)

 		}

 	}()