From e386dfc33fc1fd5ed06496bd19f01a37c3c46341 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Sat, 27 Feb 2016 07:55:20 -0500 Subject: [PATCH] fix double-lock Signed-off-by: Brian Goff --- daemon/graphdriver/aufs/aufs.go | 2 -- daemon/graphdriver/aufs/mount.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index e03576aa8a..2d73d282fc 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/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 } diff --git a/daemon/graphdriver/aufs/mount.go b/daemon/graphdriver/aufs/mount.go index d7e9bf9fd7..36fa62e41b 100644 --- a/daemon/graphdriver/aufs/mount.go +++ b/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