Merge pull request #49670 from mtanino/issue/49669

Automatic merge from submit-queue (batch tested with PRs 49712, 49694, 49714, 49670, 49717) FC volume plugin: remove unmount of global mount **What this PR does / why we need it**: The unmount operation for global mount should be done by reconciler.go instead of executing inside the FC Plugin since attacher/detacher for FC plugin was merged recently. **Which issue this PR fixes** : fixes #49669 **Special notes for your reviewer**: **Release note**: ``` NONE ```

Merge pull request #49670 from mtanino/issue/49669
97f74e81 · Kubernetes Submit Queue · GitHub · a2a6fe82 · 0c262ba9 · 97f74e81
Commit 97f74e81 authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 14 deletions

disk_manager.go pkg/volume/fc/disk_manager.go +0 -14

No files found.
--- a/pkg/volume/fc/disk_manager.go
+++ b/pkg/volume/fc/disk_manager.go
@@ -79,24 +79,10 @@ func diskTearDown(manager diskManager, c fcDiskUnmounter, volPath string, mounte
 		return os.Remove(volPath)
 	}

-	refs, err := mount.GetMountRefs(mounter, volPath)
-	if err != nil {
-		glog.Errorf("failed to get reference count %s", volPath)
-		return err
-	}
 	if err := mounter.Unmount(volPath); err != nil {
 		glog.Errorf("failed to unmount %s", volPath)
 		return err
 	}
-	// If len(refs) is 1, then all bind mounts have been removed, and the
-	// remaining reference is the global mount. It is safe to detach.
-	if len(refs) == 1 {
-		mntPath := refs[0]
-		if err := manager.DetachDisk(c, mntPath); err != nil {
-			glog.Errorf("failed to detach disk from %s", mntPath)
-			return err
-		}
-	}

 	noMnt, mntErr := mounter.IsLikelyNotMountPoint(volPath)
 	if mntErr != nil {