tracing/stack-tracer: fix style issues

Impact: cleanup

Signed-off-by: Török Edwin <edwintorok@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 29 insertions, 22 deletions

diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index b15153060417..10786af95545 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -89,7 +89,7 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
 
 struct stack_frame {
         const void __user       *next_fp;
-        unsigned long           return_address;
+        unsigned long           ret_addr;
 };
 
 static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
@@ -108,33 +108,40 @@ static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
         return ret;
 }
 
+static inline void __save_stack_trace_user(struct stack_trace *trace)
+{
+        const struct pt_regs *regs = task_pt_regs(current);
+        const void __user *fp = (const void __user *)regs->bp;
+
+        if (trace->nr_entries < trace->max_entries)
+                trace->entries[trace->nr_entries++] = regs->ip;
+
+        while (trace->nr_entries < trace->max_entries) {
+                struct stack_frame frame;
+
+                frame.next_fp = NULL;
+                frame.ret_addr = 0;
+                if (!copy_stack_frame(fp, &frame))
+                        break;
+                if ((unsigned long)fp < regs->sp)
+                        break;
+                if (frame.ret_addr) {
+                        trace->entries[trace->nr_entries++] =
+                                frame.ret_addr;
+                }
+                if (fp == frame.next_fp)
+                        break;
+                fp = frame.next_fp;
+        }
+}
+
 void save_stack_trace_user(struct stack_trace *trace)
 {
         /*
          * Trace user stack if we are not a kernel thread
          */
         if (current->mm) {
-                const struct pt_regs *regs = task_pt_regs(current);
-                const void __user *fp = (const void __user *)regs->bp;
-
-                if (trace->nr_entries < trace->max_entries)
-                        trace->entries[trace->nr_entries++] = regs->ip;
-
-                while (trace->nr_entries < trace->max_entries) {
-                        struct stack_frame frame;
-                        frame.next_fp = NULL;
-                        frame.return_address = 0;
-                        if (!copy_stack_frame(fp, &frame))
-                                break;
-                        if ((unsigned long)fp < regs->sp)
-                                break;
-                        if (frame.return_address)
-                                trace->entries[trace->nr_entries++] =
-                                        frame.return_address;
-                        if (fp == frame.next_fp)
-                                break;
-                        fp = frame.next_fp;
-                }
+                __save_stack_trace_user(trace);
         }
         if (trace->nr_entries < trace->max_entries)
                 trace->entries[trace->nr_entries++] = ULONG_MAX;