From 73d8af9319cb3f6183d693a4abc0ef93dabf9b97 Mon Sep 17 00:00:00 2001
From: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date: Mon, 7 Sep 2015 11:07:12 +0800
Subject: [PATCH] before adjusting should check whether need return or not

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
---
 daemon/create.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemon/create.go b/daemon/create.go
index 62262792bd..5769fdb111 100644
--- a/daemon/create.go
+++ b/daemon/create.go
@@ -21,11 +21,12 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
 	}
 
 	warnings, err := daemon.verifyContainerSettings(hostConfig, config)
-	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
 	if err != nil {
 		return nil, warnings, err
 	}
 
+	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
+
 	container, buildWarnings, err := daemon.Create(config, hostConfig, name)
 	if err != nil {
 		if daemon.Graph().IsNotExist(err, config.Image) {