From 7572919201ecd5dcd9f01c826cb3dcae15d6610c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 28 Sep 2020 11:36:41 +0200
Subject: [PATCH] mount: remove remaining uses of mount.Self()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 mount/mountinfo_unix.go         | 28 ----------------------------
 mount/mountinfo_unsupported.go  | 29 -----------------------------
 pkg/cri/server/helpers_linux.go |  3 ++-
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 mount/mountinfo_unix.go
 delete mode 100644 mount/mountinfo_unsupported.go

diff --git a/mount/mountinfo_unix.go b/mount/mountinfo_unix.go
deleted file mode 100644
index cded478a8..000000000
--- a/mount/mountinfo_unix.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build linux freebsd openbsd
-
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package mount
-
-import (
-	"github.com/moby/sys/mountinfo"
-)
-
-// Self retrieves a list of mounts for the current running process.
-func Self() ([]*Info, error) {
-	return mountinfo.GetMounts(nil)
-}
diff --git a/mount/mountinfo_unsupported.go b/mount/mountinfo_unsupported.go
deleted file mode 100644
index 994871426..000000000
--- a/mount/mountinfo_unsupported.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build !linux,!freebsd,!openbsd
-
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package mount
-
-import (
-	"fmt"
-	"runtime"
-)
-
-// Self retrieves a list of mounts for the current running process.
-func Self() ([]*Info, error) {
-	return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
-}
diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go
index 1e207d38a..4b70aa7b8 100644
--- a/pkg/cri/server/helpers_linux.go
+++ b/pkg/cri/server/helpers_linux.go
@@ -33,6 +33,7 @@ import (
 	"github.com/containerd/containerd/pkg/apparmor"
 	"github.com/containerd/containerd/pkg/seccomp"
 	"github.com/containerd/containerd/pkg/seutil"
+	"github.com/moby/sys/mountinfo"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
@@ -165,7 +166,7 @@ func openLogFile(path string) (*os.File, error) {
 // unmountRecursive unmounts the target and all mounts underneath, starting with
 // the deepest mount first.
 func unmountRecursive(ctx context.Context, target string) error {
-	mounts, err := mount.Self()
+	mounts, err := mountinfo.GetMounts(nil)
 	if err != nil {
 		return err
 	}