From e022efa0f87b8c0d59ce8efeb370b3eeed145a28 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Wed, 7 Nov 2018 10:44:33 -0600
Subject: move defer'd function declaration ahead of prepare error return

Signed-off-by: baude <bbaude@redhat.com>
---
 libpod/container_api.go            | 21 ++++++++++++---------
 libpod/container_internal.go       | 13 +++++++------
 libpod/container_internal_linux.go |  7 ++++---
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/libpod/container_api.go b/libpod/container_api.go
index 30c67eb2a..c706c5b30 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -46,9 +46,6 @@ func (c *Container) Init(ctx context.Context) (err error) {
 		return errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString)
 	}
 
-	if err := c.prepare(); err != nil {
-		return err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -57,6 +54,10 @@ func (c *Container) Init(ctx context.Context) (err error) {
 		}
 	}()
 
+	if err := c.prepare(); err != nil {
+		return err
+	}
+
 	if c.state.State == ContainerStateStopped {
 		// Reinitialize the container
 		return c.reinit(ctx)
@@ -99,9 +100,6 @@ func (c *Container) Start(ctx context.Context) (err error) {
 		return errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString)
 	}
 
-	if err := c.prepare(); err != nil {
-		return err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -110,6 +108,10 @@ func (c *Container) Start(ctx context.Context) (err error) {
 		}
 	}()
 
+	if err := c.prepare(); err != nil {
+		return err
+	}
+
 	if c.state.State == ContainerStateStopped {
 		// Reinitialize the container if we need to
 		if err := c.reinit(ctx); err != nil {
@@ -164,9 +166,6 @@ func (c *Container) StartAndAttach(ctx context.Context, streams *AttachStreams,
 		return nil, errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString)
 	}
 
-	if err := c.prepare(); err != nil {
-		return nil, err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -175,6 +174,10 @@ func (c *Container) StartAndAttach(ctx context.Context, streams *AttachStreams,
 		}
 	}()
 
+	if err := c.prepare(); err != nil {
+		return nil, err
+	}
+
 	if c.state.State == ContainerStateStopped {
 		// Reinitialize the container if we need to
 		if err := c.reinit(ctx); err != nil {
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index d928c4aed..de15736f4 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -623,9 +623,6 @@ func (c *Container) initAndStart(ctx context.Context) (err error) {
 		return errors.Wrapf(ErrCtrStateInvalid, "cannot start paused container %s", c.ID())
 	}
 
-	if err := c.prepare(); err != nil {
-		return err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -634,6 +631,10 @@ func (c *Container) initAndStart(ctx context.Context) (err error) {
 		}
 	}()
 
+	if err := c.prepare(); err != nil {
+		return err
+	}
+
 	// If we are ContainerStateStopped we need to remove from runtime
 	// And reset to ContainerStateConfigured
 	if c.state.State == ContainerStateStopped {
@@ -719,9 +720,6 @@ func (c *Container) restartWithTimeout(ctx context.Context, timeout uint) (err e
 			return err
 		}
 	}
-	if err := c.prepare(); err != nil {
-		return err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -729,6 +727,9 @@ func (c *Container) restartWithTimeout(ctx context.Context, timeout uint) (err e
 			}
 		}
 	}()
+	if err := c.prepare(); err != nil {
+		return err
+	}
 
 	if c.state.State == ContainerStateStopped {
 		// Reinitialize the container if we need to
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 7bf2c71ca..df94a0571 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -484,9 +484,6 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) {
 		}
 	}
 
-	if err := c.prepare(); err != nil {
-		return err
-	}
 	defer func() {
 		if err != nil {
 			if err2 := c.cleanup(ctx); err2 != nil {
@@ -495,6 +492,10 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) {
 		}
 	}()
 
+	if err := c.prepare(); err != nil {
+		return err
+	}
+
 	// TODO: use existing way to request static IPs, once it is merged in ocicni
 	// https://github.com/cri-o/ocicni/pull/23/
 
-- 
cgit v1.2.3-54-g00ecf