Merge pull request #8850 from shuai-z/clean-mount

Clear the internal state before raising error.
Upstream-commit: f68b8b33e6827c54d86abdd7ef36356453d3703b
Component: engine

components/engine/daemon/daemon.go

@@ -970,6 +970,7 @@ func (daemon *Daemon) Mount(container *Container) error {
 	if container.basefs == "" {
 		container.basefs = dir
 	} else if container.basefs != dir {
+		daemon.driver.Put(container.ID)
 		return fmt.Errorf("Error: driver %s is returning inconsistent paths for container %s ('%s' then '%s')",
 			daemon.driver, container.ID, container.basefs, dir)
 	}