Merge "Fix leak of loop/nbd devices in injection using localfs"

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()
 

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)})