fix double-lock

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-02-27 07:55:20 -05:00
parent c2f7777603
commit e386dfc33f
2 changed files with 1 additions and 3 deletions

View File

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

View File

@ -12,7 +12,7 @@ import (
// Unmount the target specified. // Unmount the target specified.
func Unmount(target string) error { func Unmount(target string) error {
if err := exec.Command("auplink", target, "flush").Run(); err != nil { 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 { if err := syscall.Unmount(target, 0); err != nil {
return err return err