Merge pull request #90 from kolyshkin/fix-mounted

mountinfo.Mounted(): fix
moby · Nov 3, 2021 · 26b84be · 26b84be
2 parents 1bcc0b1 + 90da438
commit 26b84be
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 228 deletions.
diff --git a/mountinfo/mounted_linux.go b/mountinfo/mounted_linux.go
@@ -16,9 +16,6 @@ func mountedByOpenat2(path string) (bool, error) {
 		Flags: unix.O_PATH | unix.O_CLOEXEC,
 	})
 	if err != nil {
-		if err == unix.ENOENT { // not a mount
-			return false, nil
-		}
 		return false, &os.PathError{Op: "openat2", Path: dir, Err: err}
 	}
 	fd, err := unix.Openat2(dirfd, last, &unix.OpenHow{
@@ -32,14 +29,16 @@ func mountedByOpenat2(path string) (bool, error) {
 		return false, nil
 	case unix.EXDEV: // definitely a mount
 		return true, nil
-	case unix.ENOENT: // not a mount
-		return false, nil
 	}
 	// not sure
 	return false, &os.PathError{Op: "openat2", Path: path, Err: err}
 }
 
 func mounted(path string) (bool, error) {
+	path, err := normalizePath(path)
+	if err != nil {
+		return false, err
+	}
 	// Try a fast path, using openat2() with RESOLVE_NO_XDEV.
 	mounted, err := mountedByOpenat2(path)
 	if err == nil {