aboutsummaryrefslogtreecommitdiff
path: root/pkg/driver/volume.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/driver/volume.go')
-rw-r--r--pkg/driver/volume.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/pkg/driver/volume.go b/pkg/driver/volume.go
index 8abf88b..023abf9 100644
--- a/pkg/driver/volume.go
+++ b/pkg/driver/volume.go
@@ -123,12 +123,7 @@ func (vol *Volume) Unstage(stagingTargetPath string) error {
// after a CSI driver restart. In this case, we need to force unmount.
glog.Infof("volume %s has no unmounter (rebuilt from existing mount), using force unmount", vol.VolumeId)
- // Try to unmount the staging path
- if err := mountutil.Unmount(stagingTargetPath); err != nil {
- glog.Warningf("error force unmounting volume %s: %v", vol.VolumeId, err)
- }
-
- // Clean up using mount utilities
+ // Clean up using mount utilities. This will also handle unmounting.
if err := mount.CleanupMountPoint(stagingTargetPath, mountutil, true); err != nil {
glog.Warningf("error cleaning up mount point for volume %s: %v", vol.VolumeId, err)
}