Merge pull request #1226 from chrisThePattyEater/automated-cherry-pick-of-#1225-upstream-release-1.22

Automated cherry pick of #1225: Revert "Denoise force unpublish"

Author: amacaskill

pkg/csi_driver/node.go

@@ -407,13 +407,7 @@ func (s *nodeServer) NodeUnpublishVolume(_ context.Context, req *csi.NodeUnpubli
 		forceUnmounter, ok := s.mounter.(mount.MounterForceUnmounter)
 		if ok {
 			if err = forceUnmounter.UnmountWithForce(targetPath, UmountTimeout); err != nil {
-				mounted, isMountedErr := s.isDirMounted(targetPath)
-				if mounted || isMountedErr != nil {
-					// If it's still mounted OR we couldn't check, return the original error
-					return nil, status.Errorf(codes.Internal, "failed to force unmount target path %q: %v", targetPath, err)
-				}
-				// The mount is gone, so we treat the unmountErr as a false positive (warning only).
-				klog.Warningf("failed to force unmount target path (%q) because mount is already gone. Proceeding.", targetPath)
+				return nil, status.Errorf(codes.Internal, "failed to force unmount target path %q: %v", targetPath, err)
 			}
 		} else {
 			klog.Warningf("failed to cast the mounter to a forceUnmounter, proceed with the default mounter Unmount")