Merge pull request #23939 from vdemeester/rename-same-no-lock

No need for container.Lock if rename same name
Upstream-commit: 9ed0feece84f44d449c62f091566e119e97b7b63
Component: engine

components/engine/daemon/rename.go

@@ -33,13 +33,13 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error {
 	oldName = container.Name
 	oldIsAnonymousEndpoint := container.NetworkSettings.IsAnonymousEndpoint
 
-	container.Lock()
-	defer container.Unlock()
-
 	if oldName == newName {
 		return fmt.Errorf("Renaming a container with the same name as its current name")
 	}
 
+	container.Lock()
+	defer container.Unlock()
+
 	if newName, err = daemon.reserveName(container.ID, newName); err != nil {
 		return fmt.Errorf("Error when allocating new name: %v", err)
 	}