GitList

Browse code

Clear the internal state ourselves before raising error.

If we need to raise an error, make sure the internal state is clean, because
a successful driver.Get() may have its internal state changed (eg. counting,
or mounts), while callers will only do that after a succussful Mount().

Signed-off-by: shuai-z <zs.broccoli@gmail.com>

shuai-z authored on 2014/10/30 14:31:19
Showing 1 changed files

daemon/daemon.go index 658d578..c19ebe9 100644

daemon/daemon.go

History View file @ 05ff40b

@@ -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)
+                     	}