diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 760e55136c2c93978d353f5d87f4801eb3af79b7..9b0380100047cc0974de71c487f01b4b5c7514eb 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4682,8 +4682,8 @@ class LUNodeQueryStorage(NoHooksLU):
                        selected=self.op.output_fields)
 
   def ExpandNames(self):
+    self.share_locks = _ShareAll()
     self.needed_locks = {}
-    self.share_locks[locking.LEVEL_NODE] = 1
 
     if self.op.nodes:
       self.needed_locks[locking.LEVEL_NODE] = \