Merge pull request #121851 from andyzhangx/fix-smb-IsCorruptedMnt

k8s-publishing-bot · k8s-publishing-bot · commit 00b898b94b20 · 2023-11-16T18:53:01.000Z
fix: statle smb mount issue when smb file share is deleted and then unmount

Kubernetes-commit: 8509ab82b96caa2365552efa08c8ba8baf11c5ec
diff --git a/mount_helper_unix.go b/mount_helper_unix.go
@@ -61,7 +61,7 @@ func IsCorruptedMnt(err error) bool {
 		underlyingError = err
 	}
 
-	return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN
+	return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN || underlyingError == syscall.EWOULDBLOCK
 }
 
 // MountInfo represents a single line in /proc/<pid>/mountinfo.

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ 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`
	`64`	`+ return underlyingError == syscall.ENOTCONN \|\| underlyingError == syscall.ESTALE \|\| underlyingError == syscall.EIO \|\| underlyingError == syscall.EACCES \|\| underlyingError == syscall.EHOSTDOWN \|\| underlyingError == syscall.EWOULDBLOCK`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// MountInfo represents a single line in /proc/<pid>/mountinfo.`