~/go/src/k8s.io/kubernetes# git diff
diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go
index 4195ab38759..192ceec9677 100644
--- a/pkg/volume/csi/csi_mounter.go
+++ b/pkg/volume/csi/csi_mounter.go
@@ -364,6 +364,10 @@ func (c *csiMountMgr) TearDownAt(dir string) error {

        // clean mount point dir
        if err := removeMountDir(c.plugin, dir); err != nil {
+               if isCorruptedDir(dir) {
+                       klog.Warningf(log("dir[%s] is corrupted, error: %v, skip mount dir removal", dir, err))
+                       return nil
+               }
                return errors.New(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err))
        }
        klog.V(4).Infof(log("mounter.TearDownAt successfully unmounted dir [%s]", dir))
diff --git a/vendor/k8s.io/utils/mount/mount_helper_unix.go b/vendor/k8s.io/utils/mount/mount_helper_unix.go
index 11b70ebc298..2c14a27c719 100644
--- a/vendor/k8s.io/utils/mount/mount_helper_unix.go
+++ b/vendor/k8s.io/utils/mount/mount_helper_unix.go
@@ -52,7 +52,7 @@ func IsCorruptedMnt(err error) bool {
                underlyingError = pe.Err
        }

-       return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES
+       return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN
 }

 // MountInfo represents a single line in /proc/<pid>/mountinfo.