1 files changed, 13 insertions, 9 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 6ed504f4750e..677a932e08be 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -645,7 +645,7 @@ static long gsnedf_admit_task(struct task_struct* tsk)
 #include <litmus/fdso.h>
 
 /* called with IRQs off */
-static void set_priority_inheritance(struct task_struct* t, struct task_struct* prio_inh)
+static void increase_priority_inheritance(struct task_struct* t, struct task_struct* prio_inh)
 {
         int linked_on;
         int check_preempt = 0;
@@ -653,7 +653,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct*
         raw_spin_lock(&gsnedf_lock);
 
         TRACE_TASK(t, "inherits priority from %s/%d\n", prio_inh->comm, prio_inh->pid);
-        tsk_rt(t)->inh_task = prio_inh;
+        tsk_rt(t)->eff_prio = prio_inh;
 
         linked_on  = tsk_rt(t)->linked_on;
 
@@ -712,7 +712,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct*
 }
 
 /* called with IRQs off */
-static void clear_priority_inheritance(struct task_struct* t)
+static void decrease_priority_inheritance(struct task_struct* t, struct task_struct* prio_inh)
 {
         raw_spin_lock(&gsnedf_lock);
 
@@ -720,8 +720,12 @@ static void clear_priority_inheritance(struct task_struct* t)
          * resource. Thus we can make the following assumption.*/
         BUG_ON(tsk_rt(t)->scheduled_on == NO_CPU);
 
-        TRACE_TASK(t, "priority restored\n");
-        tsk_rt(t)->inh_task = NULL;
+    if(prio_inh)
+        TRACE_TASK(t, "inherited priority decreased to %s/%d\n", prio_inh->comm, prio_inh->pid);
+    else
+        TRACE_TASK(t, "base priority restored.\n");
+        
+        tsk_rt(t)->eff_prio = prio_inh;
 
         /* Check if rescheduling is necessary. We can't use heap_decrease()
          * since the priority was effectively lowered. */
@@ -797,7 +801,7 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
                 if (edf_higher_prio(t, sem->hp_waiter)) {
                         sem->hp_waiter = t;
                         if (edf_higher_prio(t, sem->owner))
-                                set_priority_inheritance(sem->owner, sem->hp_waiter);
+                                increase_priority_inheritance(sem->owner, sem->hp_waiter);
                 }
 
                 TS_LOCK_SUSPEND;
@@ -865,7 +869,7 @@ int gsnedf_fmlp_unlock(struct litmus_lock* l)
                         /* Well, if next is not the highest-priority waiter,
                          * then it ought to inherit the highest-priority
                          * waiter's priority. */
-                        set_priority_inheritance(next, sem->hp_waiter);
+                        increase_priority_inheritance(next, sem->hp_waiter);
                 }
 
                 /* wake up next */
@@ -875,8 +879,8 @@ int gsnedf_fmlp_unlock(struct litmus_lock* l)
                 sem->owner = NULL;
 
         /* we lose the benefit of priority inheritance (if any) */
-        if (tsk_rt(t)->inh_task)
-                clear_priority_inheritance(t);
+        if (tsk_rt(t)->eff_prio)
+                decrease_priority_inheritance(t, NULL);
 
 out:
         spin_unlock_irqrestore(&sem->wait.lock, flags);