Merge pull request #565 from andyzhangx/RemoveStageTarget

cleanup: remove useless functions

Author: andyzhangx

pkg/smb/smb_common_darwin.go

@@ -29,14 +29,6 @@ func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, options [
 	return m.MountSensitive(source, target, fsType, options, sensitiveMountOptions)
 }
 
-func Unmount(m *mount.SafeFormatAndMount, target string) error {
-	return m.Unmount(target)
-}
-
-func RemoveStageTarget(m *mount.SafeFormatAndMount, target string) error {
-	return os.Remove(target)
-}
-
 func CleanupSMBMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
 	return mount.CleanupMountPoint(target, m, extensiveMountCheck)
 }

pkg/smb/smb_common_linux.go

@@ -29,18 +29,7 @@ func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, options,
 	return m.MountSensitive(source, target, fsType, options, sensitiveMountOptions)
 }
 
-func Unmount(m *mount.SafeFormatAndMount, target string) error {
-	return m.Unmount(target)
-}
-
-func RemoveStageTarget(m *mount.SafeFormatAndMount, target string) error {
-	return os.Remove(target)
-}
-
 func CleanupSMBMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
-	// unmount first since if remote SMB directory is not found, linked path cannot be deleted with CleanupMountPoint
-	// https://github.com/kubernetes/kubernetes/issues/97031
-	_ = m.Unmount(target)
 	return mount.CleanupMountPoint(target, m, extensiveMountCheck)
 }
 

pkg/smb/smb_common_windows.go

@@ -35,25 +35,14 @@ func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, mountOpti
 	return fmt.Errorf("could not cast to csi proxy class")
 }
 
-func Unmount(m *mount.SafeFormatAndMount, target string) error {
-	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
-		return proxy.SMBUnmount(target)
-	}
-	return fmt.Errorf("could not cast to csi proxy class")
-}
-
-func RemoveStageTarget(m *mount.SafeFormatAndMount, target string) error {
-	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
-		return proxy.Rmdir(target)
-	}
-	return fmt.Errorf("could not cast to csi proxy class")
-}
-
 // CleanupSMBMountPoint - In windows CSI proxy call to umount is used to unmount the SMB.
 // The clean up mount point point calls is supposed for fix the corrupted directories as well.
 // For alpha CSI proxy integration, we only do an unmount.
 func CleanupSMBMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
-	return Unmount(m, target)
+	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
+		return proxy.SMBUnmount(target)
+	}
+	return fmt.Errorf("could not cast to csi proxy class")
 }
 
 func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {