Merge pull request #1856 from k8s-infra-cherrypick-robot/cherry-pick-…

…1855-to-release-1.30 [release-1.30] cleanup: refine extensiveMountCheck usage in unmount
kubernetes-sigs · Apr 19, 2024 · 5b31aa3 · 5b31aa3
2 parents 18a7612 + 72015e8
commit 5b31aa3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/azurefile/azure_common_linux.go b/pkg/azurefile/azure_common_linux.go
@@ -33,12 +33,12 @@ func SMBMount(m *mount.SafeFormatAndMount, source, target, fsType string, option
 	return m.MountSensitive(source, target, fsType, options, sensitiveMountOptions)
 }
 
-func SMBUnmount(m *mount.SafeFormatAndMount, target string, _, _ bool) error {
-	return mount.CleanupMountPoint(target, m.Interface, true /*extensiveMountPointCheck*/)
+func SMBUnmount(m *mount.SafeFormatAndMount, target string, extensiveMountCheck, _ bool) error {
+	return mount.CleanupMountPoint(target, m.Interface, extensiveMountCheck)
 }
 
-func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, _ bool) error {
-	return mount.CleanupMountPoint(target, m.Interface, true /*extensiveMountPointCheck*/)
+func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
+	return mount.CleanupMountPoint(target, m.Interface, extensiveMountCheck)
 }
 
 func preparePublishPath(_ string, _ *mount.SafeFormatAndMount) error {

diff --git a/pkg/mounter/safe_mounter_host_process_windows.go b/pkg/mounter/safe_mounter_host_process_windows.go
@@ -134,8 +134,7 @@ func (mounter *winMounter) Unmount(target string) error {
 	remoteServer, err := smb.GetRemoteServerFromTarget(target)
 	if err == nil {
 		klog.V(2).Infof("remote server path: %s, local path: %s", remoteServer, target)
-		hasDupSMBMount, err := smb.CheckForDuplicateSMBMounts(driverGlobalMountPath, target, remoteServer)
-		if err == nil {
+		if hasDupSMBMount, err := smb.CheckForDuplicateSMBMounts(driverGlobalMountPath, target, remoteServer); err == nil {
 			if !hasDupSMBMount {
 				remoteServer = strings.Replace(remoteServer, "UNC\\", "\\\\", 1)
 				if err := smb.RemoveSmbGlobalMapping(remoteServer); err != nil {