kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Graphdriver/btrfs: Avoid using single d.Get() 

For btrfs driver, in d.Create(), Get() of parentDir is called but not followed
by Put().

If we apply SElinux mount label, we need to mount btrfs subvolumes in d.Get(),
without a Put() would end up with a later Remove() failure on
"Device resourse is busy".

This calls the subvolume helper function directly in d.Create().

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
This commit is contained in:
Liu Bo 2016-02-04 10:25:24 -08:00
parent 61464701fa
commit b2e27fee53
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/graphdriver/btrfs/btrfs.go
View File

@ -256,10 +256,14 @@ func (d *Driver) Create(id, parent, mountLabel string) error {
return err
}
} else {
parentDir, err := d.Get(parent, "")
parentDir := d.subvolumesDirID(parent)
st, err := os.Stat(parentDir)
if err != nil {
return err
}
if !st.IsDir() {
return fmt.Errorf("%s: not a direcotory", parentDir)
}
if err := subvolSnapshot(parentDir, subvolumes, id); err != nil {
return err
}