Bugfix: get right domain in unlink() even if linked_on == NO_CPU

- Why do I keep moving lines around without double checking it?? :|

1 files changed, 6 insertions, 2 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 86a66b46ff8b..dace343a62d9 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -246,10 +246,10 @@ static noinline void unlink(struct task_struct* t)
                 return;
         }
 
-        entry = &per_cpu(cedf_cpu_entries, t->rt_param.linked_on);
 
         if (t->rt_param.linked_on != NO_CPU) {
                 /* unlink */
+                entry = &per_cpu(cedf_cpu_entries, t->rt_param.linked_on);
                 t->rt_param.linked_on = NO_CPU;
                 link_task_to_cpu(NULL, entry);
         } else if (is_queued(t)) {
@@ -259,8 +259,12 @@ static noinline void unlink(struct task_struct* t)
                  * been relinked to this CPU), thus it must be in some
                  * queue. We must remove it from the list in this
                  * case.
+                 *
+                 * in C-EDF case is should be somewhere in the queue for
+                 * its domain, therefore and we can get the domain using
+                 * task_cpu_cluster
                  */
-                remove(&(entry->cluster)->domain, t);
+                remove(&(task_cpu_cluster(t))->domain, t);
         }
 }