Browse Source

volume/local: call umount unconditionally

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>
Kir Kolyshkin 7 năm trước cách đây
mục cha
commit
ac39a95ea6
1 tập tin đã thay đổi với 1 bổ sung12 xóa
  1. 1 12
      volume/local/local.go

+ 1 - 12
volume/local/local.go

@@ -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 {
-				if info.Mountpoint == v.path {
-					mount.Unmount(v.path)
-					break
-				}
-			}
+			mount.Unmount(v.path)
 		}
 		}
 	}
 	}