mount-utils: treat syscall.ENODEV as corrupted mount

dobsonj · dobsonj · commit 4cec4e742273 · 2024-07-19T08:14:30.000-06:00
diff --git a/staging/src/k8s.io/mount-utils/mount_helper_unix.go b/staging/src/k8s.io/mount-utils/mount_helper_unix.go
@@ -61,7 +61,13 @@ func IsCorruptedMnt(err error) bool {
 		underlyingError = err
 	}
 
-	return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN || underlyingError == syscall.EWOULDBLOCK
+	return errors.Is(underlyingError, syscall.ENOTCONN) ||
+		errors.Is(underlyingError, syscall.ESTALE) ||
+		errors.Is(underlyingError, syscall.EIO) ||
+		errors.Is(underlyingError, syscall.EACCES) ||
+		errors.Is(underlyingError, syscall.EHOSTDOWN) ||
+		errors.Is(underlyingError, syscall.EWOULDBLOCK) ||
+		errors.Is(underlyingError, syscall.ENODEV)
 }
 
 // MountInfo represents a single line in /proc/<pid>/mountinfo.

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,13 @@ func IsCorruptedMnt(err error) bool {`
`61`	`61`	`underlyingError = err`
`62`	`62`	`}`
`63`	`63`
`64`		`- return underlyingError == syscall.ENOTCONN \|\| underlyingError == syscall.ESTALE \|\| underlyingError == syscall.EIO \|\| underlyingError == syscall.EACCES \|\| underlyingError == syscall.EHOSTDOWN \|\| underlyingError == syscall.EWOULDBLOCK`
	`64`	`+ return errors.Is(underlyingError, syscall.ENOTCONN) \|\|`
	`65`	`+ errors.Is(underlyingError, syscall.ESTALE) \|\|`
	`66`	`+ errors.Is(underlyingError, syscall.EIO) \|\|`
	`67`	`+ errors.Is(underlyingError, syscall.EACCES) \|\|`
	`68`	`+ errors.Is(underlyingError, syscall.EHOSTDOWN) \|\|`
	`69`	`+ errors.Is(underlyingError, syscall.EWOULDBLOCK) \|\|`
	`70`	`+ errors.Is(underlyingError, syscall.ENODEV)`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`// MountInfo represents a single line in /proc/<pid>/mountinfo.`