Clean up logic

1 files changed, 2 insertions, 9 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index aafe3e095c2a..0f11683cdd9f 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -757,7 +757,6 @@ static noinline void job_completion(struct task_struct *t, int forced)
                 cpu = remote_cpu_entry(t->rt_param.scheduled_on);
                 /*Unlink first while it's not a ghost job.*/
                 unlink(t);
-                already_unlinked = 1;
                 t->rt_param.job_params.ghost_budget = budget_remaining(t);
                 t->rt_param.job_params.is_ghost = 1;
                 /* If we did just convert the job to ghost, we can safely
@@ -776,24 +775,18 @@ static noinline void job_completion(struct task_struct *t, int forced)
                         return;
                 }
         }
-        /* prepare for next period */
+        /* prepare for next period - we either just became ghost but with no
+         * budget left, or we were already ghost and the ghost job expired*/
         if (is_ghost(t)) {
                 t->rt_param.job_params.ghost_budget = 0;
                 /*Need to unlink here so prepare_for_next_period doesn't try
                  * to unlink us
                  */
                 unlink(t);
-                already_unlinked = 1;
                 prepare_for_next_period(t);
         }
-        else {
-                t->rt_param.job_params.ghost_budget = budget_remaining(t);
-        }
         if (is_released(t, litmus_clock()))
                 sched_trace_task_release(t);
-        /* unlink if we didn't above */
-        if (!already_unlinked)
-                unlink(t);
         /* requeue
          * But don't requeue a blocking task. */
         if (is_running(t))