Fixed bug when removing ghost group requests.

1 files changed, 21 insertions, 25 deletions

diff --git a/litmus/dgl.c b/litmus/dgl.c
index 09314606866e..82a5e0b0e62c 100644
--- a/litmus/dgl.c
+++ b/litmus/dgl.c
@@ -7,14 +7,14 @@
 
 #define DEBUG_DGL
 
-#define STRACE2(fmt, args...) printk(KERN_ERR fmt, ## args)
-
 #ifdef DEBUG_DGL
 #define TRACE(fmt, args...) STRACE(fmt, ## args)
+#define STRACE2(fmt, args...) STRACE(fmt, ## args)
 #define TRACE_GREQ(greq, fmt, args...)                                         \
         TRACE("(greq-%s/%llu) " fmt, (greq->task ? greq->task->comm : "greq"), \
               (greq->task ? greq->task->pid : (unsigned long long)greq), ## args)
 #else
+#define STRACE2(fmt, args...) printk(KERN_ERR fmt, ## args)
 #define TRACE(fmt, args...)
 #define TRACE_GREQ(greq, fmt, args...)
 #endif
@@ -79,7 +79,7 @@ static void print_queue(struct dgl *dgl, struct list_head *list)
 
         list_for_each_entry(pos, list, list) {
                 greq = pos->greq;
-                sched_trace_log_message("(%s-%d:r%d-p%d-b%d)->", greq->task->comm,
+                sched_trace_log_message("(%s-%d:r%d-p%x-b%x)->", greq->task->comm,
                                         greq->task->pid, pos->replicas,
                                         arr_to_bool(dgl, greq->need_prio),
                                         arr_to_bool(dgl, greq->blocked));
@@ -745,43 +745,39 @@ void remove_group_req(struct dgl *dgl, struct dgl_group_req *greq)
 
         for_each_resource(greq->requested, dgl, w, b, i) {
                 our_req  = &greq->requests[i];
+                list_del_init(&our_req->list);
                 resource = &dgl->resources[i];
 
                 if (running) {
                         resource->real_free += our_req->replicas;
                         BUG_DUMP(dgl, resource->real_free > dgl->num_replicas);
-                        update_blocked(dgl, resource);
                 }
                 if (has_prio) {
                         resource->goal_free += our_req->replicas;
                         BUG_DUMP(dgl, resource->goal_free > dgl->num_replicas);
-                        update_prio(dgl, resource);
                 }
+        }
 
-                list_del_init(&our_req->list);
+        --dgl->requests;
+
+        if (has_prio) {
+                for_each_resource(greq->requested, dgl, w, b, i) {
+                        update_prio(dgl, &dgl->resources[i]);
+                }
+                for_each_resource(greq->requested, dgl, w, b, i) {
+                        pull_prio(dgl, &dgl->resources[i]);
+                }
         }
 
-        /* if (!arr_to_bool(dgl, greq->need_prio)) { */
-        /*      for_each_resource(greq->requested, dgl, w, b, i) { */
-        /*              update_prio(dgl, &dgl->resources[i]); */
-        /*      } */
-        /*      for_each_resource(greq->requested, dgl, w, b, i) { */
-        /*              pull_prio(dgl, &dgl->resources[i]); */
-        /*      } */
-        /* } */
-
-        /* for_each_resource(greq->requested, dgl, w, b, i) { */
-        /*      resource = &dgl->resources[i]; */
-        /*      if (running)  update_blocked(dgl, resource); */
-        /*      if (has_prio) update_prio(dgl, resource); */
-        /* } */
-        for_each_resource(greq->requested, dgl, w, b, i) {
-                resource = &dgl->resources[i];
-                if (running)  pull_blocked(dgl, resource);
-                if (has_prio) pull_prio(dgl, resource);
+        if (running || has_prio) {
+                for_each_resource(greq->requested, dgl, w, b, i) {
+                        update_blocked(dgl, &dgl->resources[i]);
+                }
+                for_each_resource(greq->requested, dgl, w, b, i) {
+                        pull_blocked(dgl, &dgl->resources[i]);
+                }
         }
 
-        --dgl->requests;
         print_state(dgl);
 }