kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Protect aufs mounts with locks

Browse source 
Parallel aufs mount calls produce invalid argument error.

Fixes #21545


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-03-26 22:53:47 -07:00
parent d954186efb
commit 824c24e680
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/graphdriver/aufs/aufs.go
View file

@ -67,6 +67,7 @@ func init() {
// Driver contains information about the filesystem mounted. // Driver contains information about the filesystem mounted.
type Driver struct { type Driver struct {
sync.Mutex
root string root string
uidMaps []idtools.IDMap uidMaps []idtools.IDMap
gidMaps []idtools.IDMap gidMaps []idtools.IDMap
@ -418,6 +419,9 @@ func (a *Driver) getParentLayerPaths(id string) ([]string, error) {
} }
func (a *Driver) mount(id string, target string, mountLabel string, layers []string) error { func (a *Driver) mount(id string, target string, mountLabel string, layers []string) error {
a.Lock()
defer a.Unlock()
// If the id is mounted or we get an error return // If the id is mounted or we get an error return
if mounted, err := a.mounted(target); err != nil || mounted { if mounted, err := a.mounted(target); err != nil || mounted {
return err return err
@ -432,6 +436,9 @@ func (a *Driver) mount(id string, target string, mountLabel string, layers []str
} }
func (a *Driver) unmount(mountPath string) error { func (a *Driver) unmount(mountPath string) error {
a.Lock()
defer a.Unlock()
if mounted, err := a.mounted(mountPath); err != nil || !mounted { if mounted, err := a.mounted(mountPath); err != nil || !mounted {
return err return err
} }