Merge branch 'devel-2.4'

* devel-2.4:
  gnt-node volumes: Fix instance names

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc lib/cmdlib.py
index 484cb58,1e754af..2447fb5
--- 1/lib/cmdlib.py
--- 2/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@@ -4249,13 -3768,15 +4250,15 @@@ class LUNodeQueryvols(NoHooksLU)
      """Computes the list of nodes and their attributes.
  
      """
 -    nodenames = self.acquired_locks[locking.LEVEL_NODE]
 +    nodenames = self.glm.list_owned(locking.LEVEL_NODE)
      volumes = self.rpc.call_node_volumes(nodenames)
  
-     ilist = [self.cfg.GetInstanceInfo(iname) for iname
-              in self.cfg.GetInstanceList()]
+     ilist = self.cfg.GetAllInstancesInfo()
  
-     lv_by_node = dict([(inst, inst.MapLVsByNode()) for inst in ilist])
+     vol2inst = dict(((node, vol), inst.name)
+                     for inst in ilist.values()
+                     for (node, vols) in inst.MapLVsByNode().items()
+                     for vol in vols)
  
      output = []
      for node in nodenames: