diff options
| -rw-r--r-- | filesystem/mountpoint.go | 3 | ||||
| -rw-r--r-- | filesystem/path.go | 17 |
2 files changed, 1 insertions, 19 deletions
diff --git a/filesystem/mountpoint.go b/filesystem/mountpoint.go index 6119be8..edbdc85 100644 --- a/filesystem/mountpoint.go +++ b/filesystem/mountpoint.go @@ -319,9 +319,8 @@ func getMountFromLink(link string) (*Mount, error) { } mnt, ok := mountsByDevice[deviceNumber] if !ok { - devicePath, _ := canonicalizePath(searchPath) return nil, errors.Wrapf(ErrFollowLink, "no mounts for device %q (%v)", - devicePath, deviceNumber) + getDeviceName(deviceNumber), deviceNumber) } if mnt == nil { return nil, filesystemRootDirNotVisibleError(deviceNumber) diff --git a/filesystem/path.go b/filesystem/path.go index 376daf0..b9b403d 100644 --- a/filesystem/path.go +++ b/filesystem/path.go @@ -23,7 +23,6 @@ import ( "fmt" "log" "os" - "path/filepath" "golang.org/x/sys/unix" @@ -41,22 +40,6 @@ func OpenFileOverridingUmask(name string, flag int, perm os.FileMode) (*os.File, // We only check the unix permissions and the sticky bit const permMask = os.ModeSticky | os.ModePerm -// canonicalizePath turns path into an absolute path without symlinks. -func canonicalizePath(path string) (string, error) { - path, err := filepath.Abs(path) - if err != nil { - return "", err - } - path, err = filepath.EvalSymlinks(path) - - // Get a better error if we have an invalid path - if pathErr, ok := err.(*os.PathError); ok { - err = errors.Wrap(pathErr.Err, pathErr.Path) - } - - return path, err -} - // loggedStat runs os.Stat, but it logs the error if stat returns any error // other than nil or IsNotExist. func loggedStat(name string) (os.FileInfo, error) { |