GitList

Browse code

Really switch to moby/sys/mount*

Switch to moby/sys/mount and mountinfo. Keep the pkg/mount for potential
outside users.

This commit was generated by the following bash script:

```
set -e -u -o pipefail

for file in $(git grep -l 'docker/docker/pkg/mount"' | grep -v ^pkg/mount); do
sed -i -e 's#/docker/docker/pkg/mount"#/moby/sys/mount"#' \
-e 's#mount\.$GetMounts\|Mounted\|Info\|[A-Za-z]*Filter$#mountinfo.\1#g' \
$file
goimports -w $file
done
```

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2020/03/14 08:38:24
Showing 36 changed files

container/container_unix.go index 3fc6c91..82f5693 100644
daemon/container_operations_unix.go index 3098cc0..07f5cdd 100644
daemon/daemon_linux.go index 38349c8..e6b60f2 100644
daemon/daemon_linux_test.go index da8ebf1..8e13523 100644
daemon/daemon_unix.go index 0cd82b4..cda1a3b 100644
daemon/graphdriver/aufs/aufs.go index 21178d0..8396580 100644
daemon/graphdriver/aufs/mount.go index 3c5f70d..d6a760d 100644
daemon/graphdriver/btrfs/btrfs.go index dfb70a6..1866b07 100644
daemon/graphdriver/devmapper/deviceset.go index 023fb9d..590e062 100644
daemon/graphdriver/devmapper/driver.go index 400cfe0..5bc280b 100644
daemon/graphdriver/driver_linux.go index 4846f70..49cce48 100644
daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go index b07b4c1..5a93783 100644
daemon/graphdriver/overlay/overlay.go index e837a59..c018de1 100644
daemon/graphdriver/overlay2/overlay.go index 9185e56..66c3861 100644
daemon/graphdriver/zfs/zfs.go index 3d8b302..0c0daaf 100644
daemon/oci_linux.go index 60abafb..06c84ec 100644
daemon/start.go index 6f48115..a78eac4 100644
daemon/volumes_unix.go index 3f4c5ff..37a538d 100644
integration-cli/docker_api_containers_test.go index af46897..9192c4b 100644
integration-cli/docker_cli_daemon_test.go index fd55f93..e9cca31 100644
integration-cli/docker_cli_run_test.go index 9bc8d1f..4adb32f 100644
integration-cli/docker_cli_run_unix_test.go index 11cca40..8a95bc5 100644
integration/container/mounts_linux_test.go index 7a515e5..6e9fc8c 100644
pkg/archive/archive_linux.go index fae42c0..29ddd4b 100644
pkg/archive/archive_linux_test.go index ffec59b..8858d26 100644
pkg/chrootarchive/chroot_linux.go index 9802fad..e0f4ebb 100644
pkg/system/rm.go index ef7f505..9e251dc 100644
pkg/system/rm_test.go index a956d47..aa0ea7e 100644
plugin/backend_linux.go index 3201527..f77d126 100644
plugin/manager.go index aac5a46..38b18f0 100644
plugin/manager_linux.go index bda272d..a3aca0d 100644
plugin/manager_linux_test.go index a42d347..d874ef2 100644
testutil/daemon/daemon.go index a6acb0e..6c90608 100644
volume/local/local.go index e587814..17a9655 100644
volume/local/local_test.go index 381787e..ec5cecb 100644
volume/local/local_unix.go index 4ac45ba..5af8822 100644

@@ -13,10 +13,10 @@ import (
                      	containertypes "github.com/docker/docker/api/types/container"
                      	mounttypes "github.com/docker/docker/api/types/mount"
                      	swarmtypes "github.com/docker/docker/api/types/swarm"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/pkg/stringid"
                      	"github.com/docker/docker/volume"
                      	volumemounts "github.com/docker/docker/volume/mounts"
                     +	"github.com/moby/sys/mount"
                      	"github.com/opencontainers/selinux/go-selinux/label"
                      	"github.com/pkg/errors"
                      	"github.com/sirupsen/logrus"

@@ -9,8 +9,9 @@ import (
                      	"strings"
                      	"github.com/docker/docker/daemon/config"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/libnetwork/resolvconf"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	"github.com/pkg/errors"
                      	"github.com/sirupsen/logrus"
+                     )
@@ -75,7 +76,7 @@ func (daemon *Daemon) cleanupMounts() error {
                      		return err
+                     	}
                     -	info, err := mount.GetMounts(mount.SingleEntryFilter(daemon.root))
                     +	info, err := mountinfo.GetMounts(mountinfo.SingleEntryFilter(daemon.root))
                      	if err != nil {
                      		return errors.Wrap(err, "error reading mount table for cleanup")
+                     	}
@@ -122,7 +123,7 @@ func getCleanPatterns(id string) (regexps []*regexp.Regexp) {
                      	return
+                     }
                     -func shouldUnmountRoot(root string, info *mount.Info) bool {
                     +func shouldUnmountRoot(root string, info *mountinfo.Info) bool {
                      	if !strings.HasSuffix(root, info.Root) {
                      		return false
+                     	}

@@ -11,7 +11,8 @@ import (
                      	containertypes "github.com/docker/docker/api/types/container"
                      	"github.com/docker/docker/daemon/config"
                     -	"github.com/docker/docker/pkg/mount"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	"gotest.tools/v3/assert"
                      	is "gotest.tools/v3/assert/cmp"
+                     )
@@ -123,25 +124,25 @@ func TestShouldUnmountRoot(t *testing.T) {
                      	for _, test := range []struct {
                      		desc   string
                      		root   string
                     -		info   *mount.Info
                     +		info   *mountinfo.Info
                      		expect bool
                      	}{
+                     		{
                      			desc:   "root is at /",
                      			root:   "/docker",
                     -			info:   &mount.Info{Root: "/docker", Mountpoint: "/docker"},
                     +			info:   &mountinfo.Info{Root: "/docker", Mountpoint: "/docker"},
                      			expect: true,
                      		},
+                     		{
                      			desc:   "root is at in a submount from `/`",
                      			root:   "/foo/docker",
                     -			info:   &mount.Info{Root: "/docker", Mountpoint: "/foo/docker"},
                     +			info:   &mountinfo.Info{Root: "/docker", Mountpoint: "/foo/docker"},
                      			expect: true,
                      		},
+                     		{
                      			desc:   "root is mounted in from a parent mount namespace same root dir", // dind is an example of this
                      			root:   "/docker",
                     -			info:   &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"},
                     +			info:   &mountinfo.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"},
                      			expect: false,
                      		},
                      	} {
@@ -172,7 +173,7 @@ func TestShouldUnmountRoot(t *testing.T) {
                      func checkMounted(t *testing.T, p string, expect bool) {
                      	t.Helper()
                     -	mounted, err := mount.Mounted(p)
                     +	mounted, err := mountinfo.Mounted(p)
                      	assert.Check(t, err)
                      	assert.Check(t, mounted == expect, "expected %v, actual %v", expect, mounted)
+                     }

@@ -29,7 +29,6 @@ import (
                      	"github.com/docker/docker/pkg/containerfs"
                      	"github.com/docker/docker/pkg/idtools"
                      	"github.com/docker/docker/pkg/ioutils"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/pkg/parsers"
                      	"github.com/docker/docker/pkg/parsers/kernel"
                      	"github.com/docker/docker/pkg/sysinfo"
@@ -42,6 +41,7 @@ import (
                      	"github.com/docker/libnetwork/netutils"
                      	"github.com/docker/libnetwork/options"
                      	lntypes "github.com/docker/libnetwork/types"
                     +	"github.com/moby/sys/mount"
                      	"github.com/opencontainers/runc/libcontainer/cgroups"
                      	rsystem "github.com/opencontainers/runc/libcontainer/system"
                      	specs "github.com/opencontainers/runtime-spec/specs-go"

@@ -14,8 +14,8 @@ import (
                      	"github.com/docker/docker/pkg/devicemapper"
                      	"github.com/docker/docker/pkg/idtools"
                      	"github.com/docker/docker/pkg/locker"
                     -	"github.com/docker/docker/pkg/mount"
                      	units "github.com/docker/go-units"
                     +	"github.com/moby/sys/mount"
                      	"github.com/sirupsen/logrus"
                      	"golang.org/x/sys/unix"
+                     )

...	...	@@ -1,7 +1,7 @@
1	1	package graphdriver // import "github.com/docker/docker/daemon/graphdriver"
2	2
3	3	import (
4		- "github.com/docker/docker/pkg/mount"
	4	+ "github.com/moby/sys/mountinfo"
5	5	"golang.org/x/sys/unix"
6	6	)
7	7
...	...	@@ -113,7 +113,7 @@ type defaultChecker struct {
113	113	}
114	114
115	115	func (c *defaultChecker) IsMounted(path string) bool {
116		- m, _ := mount.Mounted(path)
	116	+ m, _ := mountinfo.Mounted(path)
117	117	return m
118	118	}
119	119

@@ -20,10 +20,11 @@ import (
                      	"github.com/docker/docker/oci"
                      	"github.com/docker/docker/oci/caps"
                      	"github.com/docker/docker/pkg/idtools"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/pkg/stringid"
                      	"github.com/docker/docker/rootless/specconv"
                      	volumemounts "github.com/docker/docker/volume/mounts"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	"github.com/opencontainers/runc/libcontainer/apparmor"
                      	"github.com/opencontainers/runc/libcontainer/cgroups"
                      	"github.com/opencontainers/runc/libcontainer/devices"
@@ -368,7 +369,7 @@ func getSourceMount(source string) (string, string, error) {
                      		return "", "", err
+                     	}
                     -	mi, err := mount.GetMounts(mount.ParentsFilter(sourcePath))
                     +	mi, err := mountinfo.GetMounts(mountinfo.ParentsFilter(sourcePath))
                      	if err != nil {
                      		return "", "", err
+                     	}

@@ -32,11 +32,11 @@ import (
                      	"github.com/docker/docker/integration-cli/cli/build"
                      	"github.com/docker/docker/integration-cli/daemon"
                      	"github.com/docker/docker/opts"
                     -	"github.com/docker/docker/pkg/mount"
                      	testdaemon "github.com/docker/docker/testutil/daemon"
                      	units "github.com/docker/go-units"
                      	"github.com/docker/libnetwork/iptables"
                      	"github.com/docker/libtrust"
                     +	"github.com/moby/sys/mount"
                      	"golang.org/x/sys/unix"
                      	"gotest.tools/v3/assert"
                      	"gotest.tools/v3/icmd"

@@ -27,7 +27,6 @@ import (
                      	"github.com/docker/docker/client"
                      	"github.com/docker/docker/integration-cli/cli"
                      	"github.com/docker/docker/integration-cli/cli/build"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/pkg/stringid"
                      	"github.com/docker/docker/runconfig"
                      	"github.com/docker/docker/testutil"
@@ -35,6 +34,8 @@ import (
                      	"github.com/docker/go-connections/nat"
                      	"github.com/docker/libnetwork/resolvconf"
                      	"github.com/docker/libnetwork/types"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	"gotest.tools/v3/assert"
                      	"gotest.tools/v3/icmd"
+                     )
@@ -1438,7 +1439,7 @@ func (s *DockerSuite) TestRunResolvconfUpdate(c *testing.T) {
                      	// This test case is meant to test monitoring resolv.conf when it is
                      	// a regular file not a bind mounc. So we unmount resolv.conf and replace
                      	// it with a file containing the original settings.
                     -	mounted, err := mount.Mounted("/etc/resolv.conf")
                     +	mounted, err := mountinfo.Mounted("/etc/resolv.conf")
                      	if err != nil {
                      		c.Fatal(err)
+                     	}
@@ -3789,7 +3790,7 @@ func (s *DockerSuite) TestRunVolumesMountedAsShared(c *testing.T) {
                      	dockerCmd(c, "run", "--privileged", "-v", fmt.Sprintf("%s:/volume-dest:shared", tmpDir), "busybox", "mount", "--bind", "/volume-dest/mnt1", "/volume-dest/mnt1")
                      	// Make sure a bind mount under a shared volume propagated to host.
                     -	if mounted, _ := mount.Mounted(path.Join(tmpDir, "mnt1")); !mounted {
                     +	if mounted, _ := mountinfo.Mounted(path.Join(tmpDir, "mnt1")); !mounted {
                      		c.Fatalf("Bind mount under shared volume did not propagate to host")
+                     	}

@@ -6,7 +6,8 @@ import (
                      	"os"
                      	"path/filepath"
                     -	"github.com/docker/docker/pkg/mount"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	rsystem "github.com/opencontainers/runc/libcontainer/system"
                      	"golang.org/x/sys/unix"
+                     )
@@ -36,7 +37,7 @@ func chroot(path string) (err error) {
                      		return err
+                     	}
                     -	if mounted, _ := mount.Mounted(path); !mounted {
                     +	if mounted, _ := mountinfo.Mounted(path); !mounted {
                      		if err := mount.Mount(path, path, "bind", "rbind,rw"); err != nil {
                      			return realChroot(path)
+                     		}

...	...	@@ -10,7 +10,7 @@ import (
10	10	"testing"
11	11
12	12	"github.com/docker/docker/pkg/idtools"
13		- "github.com/docker/docker/pkg/mount"
	13	+ "github.com/moby/sys/mountinfo"
14	14	"gotest.tools/v3/skip"
15	15	)
16	16
...	...	@@ -211,7 +211,7 @@ func TestCreateWithOpts(t *testing.T) {
211	211	}
212	212	}()
213	213
214		- mountInfos, err := mount.GetMounts(mount.SingleEntryFilter(dir))
	214	+ mountInfos, err := mountinfo.GetMounts(mountinfo.SingleEntryFilter(dir))
215	215	if err != nil {
216	216	t.Fatal(err)
217	217	}
...	...	@@ -253,7 +253,7 @@ func TestCreateWithOpts(t *testing.T) {
253	253	t.Fatalf("Expected active mount count to be 1, got %d", v.active.count)
254	254	}
255	255
256		- mounted, err := mount.Mounted(v.path)
	256	+ mounted, err := mountinfo.Mounted(v.path)
257	257	if err != nil {
258	258	t.Fatal(err)
259	259	}

@@ -8,7 +8,7 @@ import (
                      	"testing"
                      	"time"
                     -	"github.com/docker/docker/pkg/mount"
                     +	"github.com/moby/sys/mount"
                      	"gotest.tools/v3/skip"
+                     )

@@ -27,12 +27,12 @@ import (
                      	"github.com/docker/docker/layer"
                      	"github.com/docker/docker/pkg/authorization"
                      	"github.com/docker/docker/pkg/chrootarchive"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/pkg/pools"
                      	"github.com/docker/docker/pkg/progress"
                      	"github.com/docker/docker/pkg/system"
                      	v2 "github.com/docker/docker/plugin/v2"
                      	refstore "github.com/docker/docker/reference"
                     +	"github.com/moby/sys/mount"
                      	digest "github.com/opencontainers/go-digest"
                      	specs "github.com/opencontainers/image-spec/specs-go/v1"
                      	"github.com/pkg/errors"

@@ -16,8 +16,9 @@ import (
                      	"github.com/docker/docker/daemon/names"
                      	"github.com/docker/docker/errdefs"
                      	"github.com/docker/docker/pkg/idtools"
                     -	"github.com/docker/docker/pkg/mount"
                      	"github.com/docker/docker/volume"
                     +	"github.com/moby/sys/mount"
                     +	"github.com/moby/sys/mountinfo"
                      	"github.com/pkg/errors"
+                     )
@@ -335,7 +336,7 @@ func (v *localVolume) Unmount(id string) error {
                      func (v *localVolume) unmount() error {
                      	if v.opts != nil {
                      		if err := mount.Unmount(v.path); err != nil {
                     -			if mounted, mErr := mount.Mounted(v.path); mounted || mErr != nil {
                     +			if mounted, mErr := mountinfo.Mounted(v.path); mounted || mErr != nil {
                      				return errdefs.System(err)
+                     			}
+                     		}