diff --git a/nova/virt/disk/mount/api.py b/nova/virt/disk/mount/api.py
index 1d9d1fc20823..3690f6ddf139 100644
--- a/nova/virt/disk/mount/api.py
+++ b/nova/virt/disk/mount/api.py
@@ -211,11 +211,11 @@ class Mount(object):
         finally:
             if not status:
                 LOG.debug(_("Fail to mount, tearing back down"))
-                self.do_umount()
+                self.do_teardown()
         return status
 
     def do_umount(self):
-        """Call the unmnt, unmap and unget operations."""
+        """Call the unmnt operation."""
         if self.mounted:
             self.unmnt_dev()
 
diff --git a/nova/virt/disk/vfs/localfs.py b/nova/virt/disk/vfs/localfs.py
index 9efa6798bff6..34c52dedd655 100644
--- a/nova/virt/disk/vfs/localfs.py
+++ b/nova/virt/disk/vfs/localfs.py
@@ -85,7 +85,7 @@ class VFSLocalFS(vfs.VFS):
     def teardown(self):
         try:
             if self.mount:
-                self.mount.do_umount()
+                self.mount.do_teardown()
         except Exception, e:
             LOG.debug(_("Failed to unmount %(imgdir)s: %(ex)s") %
                       {'imgdir': self.imgdir, 'ex': str(e)})