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

Fix overlay use of rootdir and defer

Browse source 
Check for the rootDir first because the mergeDir may not exist if root
is present.

Also fix unmounting in the defer to make sure it does not have a
refcount.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-05-16 11:07:03 -07:00
parent 4bac8bce98
commit 36a82c2032
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
daemon/graphdriver/overlay/overlay.go
View file

@ -333,23 +333,22 @@ func (d *Driver) Get(id string, mountLabel string) (s string, err error) {
if _, err := os.Stat(dir); err != nil { if _, err := os.Stat(dir); err != nil {
return "", err return "", err
} }
// If id has a root, just return it
rootDir := path.Join(dir, "root")
if _, err := os.Stat(rootDir); err == nil {
return rootDir, nil
}
mergedDir := path.Join(dir, "merged") mergedDir := path.Join(dir, "merged")
if count := d.ctr.Increment(mergedDir); count > 1 { if count := d.ctr.Increment(mergedDir); count > 1 {
return mergedDir, nil return mergedDir, nil
} }
defer func() { defer func() {
if err != nil { if err != nil {
d.ctr.Decrement(mergedDir) if c := d.ctr.Decrement(mergedDir); c <= 0 {
syscall.Unmount(mergedDir, 0) syscall.Unmount(mergedDir, 0)
}
} }
}() }()
// If id has a root, just return it
rootDir := path.Join(dir, "root")
if _, err := os.Stat(rootDir); err == nil {
return rootDir, nil
}
lowerID, err := ioutil.ReadFile(path.Join(dir, "lower-id")) lowerID, err := ioutil.ReadFile(path.Join(dir, "lower-id"))
if err != nil { if err != nil {
return "", err return "", err