github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FC volume plugin: remove unmount of global mount

Browse Source
This commit is contained in:
mtanino
2017-07-26 19:41:42 -04:00
parent 04c863cb1d
commit 0c262ba9de
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/fc/disk_manager.go
View File

@@ -79,24 +79,10 @@ func diskTearDown(manager diskManager, c fcDiskUnmounter, volPath string, mounte
return os.Remove(volPath) 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 { if err := mounter.Unmount(volPath); err != nil {
glog.Errorf("failed to unmount %s", volPath) glog.Errorf("failed to unmount %s", volPath)
return err 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) noMnt, mntErr := mounter.IsLikelyNotMountPoint(volPath)
if mntErr != nil { if mntErr != nil {