From 037ab98521c5083e7da87c0d5a59724b4fdf2c5b Mon Sep 17 00:00:00 2001 From: Yecheng Fu Date: Fri, 28 Dec 2018 11:10:12 +0800 Subject: [PATCH] Deprecate mount.IsNotMountPoint --- pkg/util/mount/exec_mount_unsupported.go | 2 +- pkg/util/mount/fake.go | 2 +- pkg/util/mount/mount.go | 9 +++------ pkg/util/mount/mount_helper.go | 2 +- pkg/util/mount/mount_linux.go | 4 ++-- pkg/util/mount/mount_unsupported.go | 2 +- pkg/util/mount/mount_windows.go | 2 +- pkg/util/mount/nsenter_mount.go | 2 +- pkg/util/mount/nsenter_mount_unsupported.go | 2 +- 9 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkg/util/mount/exec_mount_unsupported.go b/pkg/util/mount/exec_mount_unsupported.go index d5a1fdc58c..3be436ce44 100644 --- a/pkg/util/mount/exec_mount_unsupported.go +++ b/pkg/util/mount/exec_mount_unsupported.go @@ -48,7 +48,7 @@ func (mounter *execMounter) IsMountPointMatch(mp MountPoint, dir string) bool { } func (mounter *execMounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(mounter, dir) + return isNotMountPoint(mounter, dir) } func (mounter *execMounter) IsLikelyNotMountPoint(file string) (bool, error) { diff --git a/pkg/util/mount/fake.go b/pkg/util/mount/fake.go index 0e2952f3e0..8b93d3b488 100644 --- a/pkg/util/mount/fake.go +++ b/pkg/util/mount/fake.go @@ -137,7 +137,7 @@ func (f *FakeMounter) IsMountPointMatch(mp MountPoint, dir string) bool { } func (f *FakeMounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(f, dir) + return isNotMountPoint(f, dir) } func (f *FakeMounter) IsLikelyNotMountPoint(file string) (bool, error) { diff --git a/pkg/util/mount/mount.go b/pkg/util/mount/mount.go index 48dfde3da4..682bdf80c4 100644 --- a/pkg/util/mount/mount.go +++ b/pkg/util/mount/mount.go @@ -245,12 +245,9 @@ func GetDeviceNameFromMount(mounter Interface, mountPath string) (string, int, e return device, refCount, nil } -// IsNotMountPoint determines if a directory is a mountpoint. -// It should return ErrNotExist when the directory does not exist. -// This method uses the List() of all mountpoints -// It is more extensive than IsLikelyNotMountPoint -// and it detects bind mounts in linux -func IsNotMountPoint(mounter Interface, file string) (bool, error) { +// isNotMountPoint implements Mounter.IsNotMountPoint and is shared by mounter +// implementations. +func isNotMountPoint(mounter Interface, file string) (bool, error) { // IsLikelyNotMountPoint provides a quick check // to determine whether file IS A mountpoint notMnt, notMntErr := mounter.IsLikelyNotMountPoint(file) diff --git a/pkg/util/mount/mount_helper.go b/pkg/util/mount/mount_helper.go index a06871e478..0d4acaae44 100644 --- a/pkg/util/mount/mount_helper.go +++ b/pkg/util/mount/mount_helper.go @@ -56,7 +56,7 @@ func doCleanupMountPoint(mountPath string, mounter Interface, extensiveMountPoin var notMnt bool var err error if extensiveMountPointCheck { - notMnt, err = IsNotMountPoint(mounter, mountPath) + notMnt, err = mounter.IsNotMountPoint(mountPath) } else { notMnt, err = mounter.IsLikelyNotMountPoint(mountPath) } diff --git a/pkg/util/mount/mount_linux.go b/pkg/util/mount/mount_linux.go index 85a9016968..8e7604a22c 100644 --- a/pkg/util/mount/mount_linux.go +++ b/pkg/util/mount/mount_linux.go @@ -229,7 +229,7 @@ func (mounter *Mounter) IsMountPointMatch(mp MountPoint, dir string) bool { } func (mounter *Mounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(mounter, dir) + return isNotMountPoint(mounter, dir) } // IsLikelyNotMountPoint determines if a directory is not a mountpoint. @@ -757,7 +757,7 @@ func safeOpenSubPath(mounter Interface, subpath Subpath) (int, error) { func prepareSubpathTarget(mounter Interface, subpath Subpath) (bool, string, error) { // Early check for already bind-mounted subpath. bindPathTarget := getSubpathBindTarget(subpath) - notMount, err := IsNotMountPoint(mounter, bindPathTarget) + notMount, err := mounter.IsNotMountPoint(bindPathTarget) if err != nil { if !os.IsNotExist(err) { return false, "", fmt.Errorf("error checking path %s for mount: %s", bindPathTarget, err) diff --git a/pkg/util/mount/mount_unsupported.go b/pkg/util/mount/mount_unsupported.go index cd6f1a28f2..918d58cd24 100644 --- a/pkg/util/mount/mount_unsupported.go +++ b/pkg/util/mount/mount_unsupported.go @@ -55,7 +55,7 @@ func (mounter *Mounter) IsMountPointMatch(mp MountPoint, dir string) bool { } func (mounter *Mounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(mounter, dir) + return isNotMountPoint(mounter, dir) } func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) { diff --git a/pkg/util/mount/mount_windows.go b/pkg/util/mount/mount_windows.go index dfdcdfc337..f4508c5227 100644 --- a/pkg/util/mount/mount_windows.go +++ b/pkg/util/mount/mount_windows.go @@ -132,7 +132,7 @@ func (mounter *Mounter) IsMountPointMatch(mp MountPoint, dir string) bool { // IsNotMountPoint determines if a directory is a mountpoint. func (mounter *Mounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(mounter, dir) + return isNotMountPoint(mounter, dir) } // IsLikelyNotMountPoint determines if a directory is not a mountpoint. diff --git a/pkg/util/mount/nsenter_mount.go b/pkg/util/mount/nsenter_mount.go index ff2eceaf7c..215da6174f 100644 --- a/pkg/util/mount/nsenter_mount.go +++ b/pkg/util/mount/nsenter_mount.go @@ -145,7 +145,7 @@ func (*NsenterMounter) List() ([]MountPoint, error) { } func (m *NsenterMounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(m, dir) + return isNotMountPoint(m, dir) } func (*NsenterMounter) IsMountPointMatch(mp MountPoint, dir string) bool { diff --git a/pkg/util/mount/nsenter_mount_unsupported.go b/pkg/util/mount/nsenter_mount_unsupported.go index 87c2e9ec73..ddc44742e8 100644 --- a/pkg/util/mount/nsenter_mount_unsupported.go +++ b/pkg/util/mount/nsenter_mount_unsupported.go @@ -46,7 +46,7 @@ func (*NsenterMounter) List() ([]MountPoint, error) { } func (m *NsenterMounter) IsNotMountPoint(dir string) (bool, error) { - return IsNotMountPoint(m, dir) + return isNotMountPoint(m, dir) } func (*NsenterMounter) IsMountPointMatch(mp MountPoint, dir string) bool {