diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-20 12:06:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 12:06:52 +0100 |
| commit | a6976c9ca8346331001dfade295173ad1482c2f6 (patch) | |
| tree | eae48e206f340a2695b1f54582fb3b28fc7cad2d /vendor/github.com/moby/sys/mountinfo/mounted_unix.go | |
| parent | 2755d0255c94ac2ef797636935f83e3351d4d5af (diff) | |
| parent | 44b240470270021e2680afe9de62e5096067a1bf (diff) | |
| download | podman-a6976c9ca8346331001dfade295173ad1482c2f6.tar.gz podman-a6976c9ca8346331001dfade295173ad1482c2f6.tar.bz2 podman-a6976c9ca8346331001dfade295173ad1482c2f6.zip | |
Merge pull request #12216 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.14.6
Bump github.com/rootless-containers/rootlesskit from 0.14.5 to 0.14.6
Diffstat (limited to 'vendor/github.com/moby/sys/mountinfo/mounted_unix.go')
| -rw-r--r-- | vendor/github.com/moby/sys/mountinfo/mounted_unix.go | 16 |
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 |