LITMUS^RT: split task admission into two functions

1 files changed, 31 insertions, 23 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index c03de2dcea0c..aaa1cacd99d6 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -345,26 +345,9 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
         }
 }
 
-long litmus_admit_task(struct task_struct* tsk)
+static long __litmus_admit_task(struct task_struct* tsk)
 {
-        long retval = 0;
-
-        BUG_ON(is_realtime(tsk));
-
-        tsk_rt(tsk)->heap_node = NULL;
-        tsk_rt(tsk)->rel_heap = NULL;
-
-        if (get_rt_relative_deadline(tsk) == 0 ||
-            get_exec_cost(tsk) >
-                        min(get_rt_relative_deadline(tsk), get_rt_period(tsk)) ) {
-                TRACE_TASK(tsk,
-                        "litmus admit: invalid task parameters "
-                        "(e = %lu, p = %lu, d = %lu)\n",
-                        get_exec_cost(tsk), get_rt_period(tsk),
-                        get_rt_relative_deadline(tsk));
-                retval = -EINVAL;
-                goto out;
-        }
+        long err;
 
         INIT_LIST_HEAD(&tsk_rt(tsk)->list);
 
@@ -375,17 +358,16 @@ long litmus_admit_task(struct task_struct* tsk)
         if (!tsk_rt(tsk)->heap_node || !tsk_rt(tsk)->rel_heap) {
                 printk(KERN_WARNING "litmus: no more heap node memory!?\n");
 
-                retval = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         } else {
                 bheap_node_init(&tsk_rt(tsk)->heap_node, tsk);
         }
 
         preempt_disable();
 
-        retval = litmus->admit_task(tsk);
+        err = litmus->admit_task(tsk);
 
-        if (!retval) {
+        if (!err) {
                 sched_trace_task_name(tsk);
                 sched_trace_task_param(tsk);
                 atomic_inc(&rt_task_count);
@@ -393,6 +375,32 @@ long litmus_admit_task(struct task_struct* tsk)
 
         preempt_enable();
 
+        return err;
+}
+
+long litmus_admit_task(struct task_struct* tsk)
+{
+        long retval = 0;
+
+        BUG_ON(is_realtime(tsk));
+
+        tsk_rt(tsk)->heap_node = NULL;
+        tsk_rt(tsk)->rel_heap = NULL;
+
+        if (get_rt_relative_deadline(tsk) == 0 ||
+            get_exec_cost(tsk) >
+                        min(get_rt_relative_deadline(tsk), get_rt_period(tsk)) ) {
+                TRACE_TASK(tsk,
+                        "litmus admit: invalid task parameters "
+                        "(e = %lu, p = %lu, d = %lu)\n",
+                        get_exec_cost(tsk), get_rt_period(tsk),
+                        get_rt_relative_deadline(tsk));
+                retval = -EINVAL;
+                goto out;
+        }
+
+        retval = __litmus_admit_task(tsk);
+
 out:
         if (retval) {
                 if (tsk_rt(tsk)->heap_node)