ring-buffer: fix ret in rb_add_time_stamp
Steven Rostedt [Fri, 5 Jun 2009 18:11:30 +0000 (14:11 -0400)]
The update of ret got mistakenly added to the if statement of
rb_try_to_discard. The variable ret should be 1 on commit and zero
otherwise.

[ Impact: fix compiler warning and real bug ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

kernel/trace/ring_buffer.c

index 22878b0..2e642b2 100644 (file)
@@ -1433,8 +1433,8 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
                        /* Darn, this is just wasted space */
                        event->time_delta = 0;
                        event->array[0] = 0;
-                       ret = 0;
                }
+               ret = 0;
        }
 
        *delta = 0;