aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/moby/sys/mountinfo/mounted_unix.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-11-19 14:25:58 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-11-19 14:26:03 -0500
commit44b240470270021e2680afe9de62e5096067a1bf (patch)
treeeae48e206f340a2695b1f54582fb3b28fc7cad2d /vendor/github.com/moby/sys/mountinfo/mounted_unix.go
parent2755d0255c94ac2ef797636935f83e3351d4d5af (diff)
downloadpodman-44b240470270021e2680afe9de62e5096067a1bf.tar.gz
podman-44b240470270021e2680afe9de62e5096067a1bf.tar.bz2
podman-44b240470270021e2680afe9de62e5096067a1bf.zip
Bump github.com/rootless-containers/rootlesskit from 0.14.5 to 0.14.6
Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.14.5 to 0.14.6. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](rootless-containers/rootlesskit@v0.14.5...v0.14.6) --- updated-dependencies: - dependency-name: github.com/rootless-containers/rootlesskit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor/github.com/moby/sys/mountinfo/mounted_unix.go')
-rw-r--r--vendor/github.com/moby/sys/mountinfo/mounted_unix.go16
1 files changed, 2 insertions, 14 deletions
diff --git a/vendor/github.com/moby/sys/mountinfo/mounted_unix.go b/vendor/github.com/moby/sys/mountinfo/mounted_unix.go
index efb03978b..45ddad236 100644
--- a/vendor/github.com/moby/sys/mountinfo/mounted_unix.go
+++ b/vendor/github.com/moby/sys/mountinfo/mounted_unix.go
@@ -1,9 +1,9 @@
-// +build linux freebsd,cgo openbsd,cgo
+//go:build linux || (freebsd && cgo) || (openbsd && cgo) || (darwin && cgo)
+// +build linux freebsd,cgo openbsd,cgo darwin,cgo
package mountinfo
import (
- "errors"
"fmt"
"os"
"path/filepath"
@@ -15,10 +15,6 @@ func mountedByStat(path string) (bool, error) {
var st unix.Stat_t
if err := unix.Lstat(path, &st); err != nil {
- if err == unix.ENOENT {
- // Treat ENOENT as "not mounted".
- return false, nil
- }
return false, &os.PathError{Op: "stat", Path: path, Err: err}
}
dev := st.Dev
@@ -49,14 +45,6 @@ func normalizePath(path string) (realPath string, err error) {
}
func mountedByMountinfo(path string) (bool, error) {
- path, err := normalizePath(path)
- if err != nil {
- if errors.Is(err, unix.ENOENT) {
- // treat ENOENT as "not mounted"
- return false, nil
- }
- return false, err
- }
entries, err := GetMounts(SingleEntryFilter(path))
if err != nil {
return false, err