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

volume/local: call umount unconditionally

Browse source 
There is no need to parse mount table and iterate through the list of
mounts, and then call Unmount() which again parses the mount table and
iterates through the list of mounts.

It is totally OK to call Unmount() unconditionally.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2018-01-19 13:27:05 -08:00
parent a1d095199d
commit ac39a95ea6
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
volume/local/local.go
View file

@ -19,7 +19,6 @@ import (
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/volume" "github.com/docker/docker/volume"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
// VolumeDataPathName is the name of the directory where the volume data is stored. // VolumeDataPathName is the name of the directory where the volume data is stored.
@ -66,11 +65,6 @@ func New(scope string, rootIDs idtools.IDPair) (*Root, error) {
return nil, err return nil, err
} }
mountInfos, err := mount.GetMounts(nil)
if err != nil {
logrus.Debugf("error looking up mounts for local volume cleanup: %v", err)
}
for _, d := range dirs { for _, d := range dirs {
if !d.IsDir() { if !d.IsDir() {
continue continue
@ -96,12 +90,7 @@ func New(scope string, rootIDs idtools.IDPair) (*Root, error) {
} }
// unmount anything that may still be mounted (for example, from an unclean shutdown) // unmount anything that may still be mounted (for example, from an unclean shutdown)
for _, info := range mountInfos { mount.Unmount(v.path)
if info.Mountpoint == v.path {
mount.Unmount(v.path)
break
}
}
} }
} }