浏览代码

fix double-lock

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff 9 年之前
父节点
当前提交
e386dfc33f
共有 2 个文件被更改,包括 1 次插入3 次删除
  1. 0 2
      daemon/graphdriver/aufs/aufs.go
  2. 1 1
      daemon/graphdriver/aufs/mount.go

+ 0 - 2
daemon/graphdriver/aufs/aufs.go

@@ -288,9 +288,7 @@ func (a *Driver) Remove(id string) error {
 		return err
 	}
 	if m != nil {
-		a.Lock()
 		delete(a.active, id)
-		a.Unlock()
 	}
 	return nil
 }

+ 1 - 1
daemon/graphdriver/aufs/mount.go

@@ -12,7 +12,7 @@ import (
 // Unmount the target specified.
 func Unmount(target string) error {
 	if err := exec.Command("auplink", target, "flush").Run(); err != nil {
-		logrus.Errorf("Couldn't run auplink before unmount: %s", err)
+		logrus.Errorf("Couldn't run auplink before unmount %s: %s", target, err)
 	}
 	if err := syscall.Unmount(target, 0); err != nil {
 		return err