util: do not use mount-utils.IsLikelyNotMountPoint anymore

`IsLikelyNotMountPoint()` is an optimized version for `IsMountPoint()`
which can not detect all type of mounts (anymore). The slower
`IsMountPoint()` is more safe to use. This can cause a slight
performance regression in the case there are many mountpoints on the
system, but correctness is more important than speed while mounting.

Fixes: #4633
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2025-03-07 17:09:40 +01:00
committed by mergify[bot]
parent 76b4f53897
commit 79cf0321dd
23 changed files with 599 additions and 112 deletions

View File

@ -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.