fix logic error

j4ckstraw · k8s-publishing-bot · commit ab4d08aa0af9 · 2024-01-01T18:06:24.000+08:00
Signed-off-by: j4ckstraw &lt;j4ckstraw@foxmail.com&gt;

Kubernetes-commit: c3775de7479b4cb8048d56040364b4f7b4e3b425
diff --git a/mount_linux.go b/mount_linux.go
@@ -442,7 +442,7 @@ func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
 			return mounter.isLikelyNotMountPoint(file)
 		}
 
-		return false, err
+		return true, err
 	}
 
 	if stat.Attributes_mask != 0 {
@@ -459,10 +459,10 @@ func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
 
 	root := filepath.Dir(strings.TrimSuffix(file, "/"))
 	if rootStat, err = statx(root); err != nil {
-		return false, err
+		return true, err
 	}
 
-	return !(stat.Dev_major == rootStat.Dev_major && stat.Dev_minor == rootStat.Dev_minor), nil
+	return (stat.Dev_major == rootStat.Dev_major && stat.Dev_minor == rootStat.Dev_minor), nil
 }
 
 // CanSafelySkipMountPointCheck relies on the detected behavior of umount when given a target that is not a mount point.

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {`
`442`	`442`	`return mounter.isLikelyNotMountPoint(file)`
`443`	`443`	`}`
`444`	`444`
`445`		`- return false, err`
	`445`	`+ return true, err`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`if stat.Attributes_mask != 0 {`
`@@ -459,10 +459,10 @@ func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {`
`459`	`459`
`460`	`460`	`root := filepath.Dir(strings.TrimSuffix(file, "/"))`
`461`	`461`	`if rootStat, err = statx(root); err != nil {`
`462`		`- return false, err`
	`462`	`+ return true, err`
`463`	`463`	`}`
`464`	`464`
`465`		`- return !(stat.Dev_major == rootStat.Dev_major && stat.Dev_minor == rootStat.Dev_minor), nil`
	`465`	`+ return (stat.Dev_major == rootStat.Dev_major && stat.Dev_minor == rootStat.Dev_minor), nil`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`// CanSafelySkipMountPointCheck relies on the detected behavior of umount when given a target that is not a mount point.`