p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36237 from cpuguy83/zfs_do_not_unmount

Browse Source 
Do not recursive unmount on cleanup of zfs/btrfs
Upstream-commit: 68c3201626439d5be5c24d14d4fe7e27fe93954d
Component: engine
This commit is contained in:
Brian Goff
2018-02-14 09:49:17 -05:00
committed by GitHub
parent e156b95318 33ddc6d172
commit 8bb8847f9c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/graphdriver/btrfs/btrfs.go
View File

@ -29,7 +29,6 @@ import (
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system"
"github.com/docker/go-units"
@ -163,7 +162,7 @@ func (d *Driver) Cleanup() error {
return err
}
return mount.RecursiveUnmount(d.home)
return nil
}
func free(p *C.char) {

5
components/engine/daemon/graphdriver/zfs/zfs.go
View File

@ -178,9 +178,10 @@ func (d *Driver) String() string {
return "zfs"
}
// Cleanup is called on daemon shutdown, it is used to clean up any remaining mounts
// Cleanup is called on daemon shutdown, it is a no-op for ZFS.
// TODO(@cpuguy83): Walk layer tree and check mounts?
func (d *Driver) Cleanup() error {
return mount.RecursiveUnmount(d.options.mountPath)
return nil
}
// Status returns information about the ZFS filesystem. It returns a two dimensional array of information