simplified

core/src/main/java/hudson/model/LoadStatistics.java

@@ -232,10 +232,8 @@ public abstract class LoadStatistics {
         private int count(List<Queue.BuildableItem> bis, Label l) {
             int q=0;
             for (Queue.BuildableItem bi : bis) {
-                if(bi.task.getAssignedLabel()==l)
-                    q++;
                 for (SubTask st : Tasks.getSubTasksOf(bi.task))
-                    if (st != bi.task && st.getAssignedLabel()==l)
+                    if (st.getAssignedLabel()==l)
                         q++;
             }
             return q;

core/src/main/java/hudson/model/Queue.java

@@ -756,19 +756,13 @@ public class Queue extends ResourceController implements Saveable {
     public synchronized int countBuildableItemsFor(Label l) {
         int r = 0;
         for (BuildableItem bi : buildables.values())
-            if(null==l || bi.getAssignedLabel()==l) {
-                r++;
-                for (SubTask st : bi.task.getSubTasks())
-                    if (st != bi.task && (null==l || st.getAssignedLabel()==l))
-                        r++;
-            }
+            for (SubTask st : bi.task.getSubTasks())
+                if (null==l || st.getAssignedLabel()==l)
+                    r++;
         for (BuildableItem bi : pendings.values())
-            if(bi.getAssignedLabel()==l) {
-                r++;
-                for (SubTask st : bi.task.getSubTasks())
-                    if (st != bi.task && (null==l || st.getAssignedLabel()==l))
-                        r++;
-            }
+            for (SubTask st : bi.task.getSubTasks())
+                if (null==l || st.getAssignedLabel()==l)
+                    r++;
         return r;
     }