From c8a46cb0b2793bb7d742a3d221ec733d1bbaae2c Mon Sep 17 00:00:00 2001
From: Lei Jitang <leijitang@huawei.com>
Date: Fri, 21 Aug 2015 11:29:53 +0800
Subject: [PATCH] Fix docker daemon start with old running container which user
 volume plugin. Fixes #15720

Signed-off-by: Lei Jitang <leijitang@huawei>
---
 daemon/daemon.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/daemon/daemon.go b/daemon/daemon.go
index 43e0aabcd5..1e68c0e37e 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -194,14 +194,6 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
 	// we'll waste time if we update it for every container
 	daemon.idIndex.Add(container.ID)
 
-	if err := daemon.verifyVolumesInfo(container); err != nil {
-		return err
-	}
-
-	if err := container.prepareMountPoints(); err != nil {
-		return err
-	}
-
 	if container.IsRunning() {
 		logrus.Debugf("killing old running container %s", container.ID)
 		// Set exit code to 128 + SIGKILL (9) to properly represent unsuccessful exit
@@ -221,6 +213,14 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
 		}
 	}
 
+	if err := daemon.verifyVolumesInfo(container); err != nil {
+		return err
+	}
+
+	if err := container.prepareMountPoints(); err != nil {
+		return err
+	}
+
 	return nil
 }