Cleanup IsCorruptedMnt callers

pkg/volume/flexvolume/detacher.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/util"
 )
 
 type flexVolumeDetacher struct {
@@ -57,13 +56,13 @@ func (d *flexVolumeDetacher) UnmountDevice(deviceMountPath string) error {
 		klog.Warningf("Warning: Unmount skipped because path does not exist: %v", deviceMountPath)
 		return nil
 	}
-	if pathErr != nil && !util.IsCorruptedMnt(pathErr) {
+	if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
 		return fmt.Errorf("Error checking path: %v", pathErr)
 	}
 
 	notmnt, err := isNotMounted(d.plugin.host.GetMounter(d.plugin.GetPluginName()), deviceMountPath)
 	if err != nil {
-		if util.IsCorruptedMnt(err) {
+		if mount.IsCorruptedMnt(err) {
 			notmnt = false // Corrupted error is assumed to be mounted.
 		} else {
 			return err

pkg/volume/flexvolume/unmounter.go

@@ -23,7 +23,6 @@ import (
 	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/utils/exec"
 )
 
@@ -50,7 +49,7 @@ func (f *flexVolumeUnmounter) TearDownAt(dir string) error {
 		return nil
 	}
 
-	if pathErr != nil && !util.IsCorruptedMnt(pathErr) {
+	if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
 		return fmt.Errorf("Error checking path: %v", pathErr)
 	}
 

pkg/volume/util/util.go

@@ -125,12 +125,6 @@ func SetReady(dir string) {
 	file.Close()
 }
 
-// IsCorruptedMnt return true if err is about corrupted mount point
-// TODO: Change callers to call mount pkg directly
-func IsCorruptedMnt(err error) bool {
-	return mount.IsCorruptedMnt(err)
-}
-
 // GetSecretForPod locates secret by name in the pod's namespace and returns secret map
 func GetSecretForPod(pod *v1.Pod, secretName string, kubeClient clientset.Interface) (map[string]string, error) {
 	secret := make(map[string]string)