From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 5 Jun 2009 18:11:30 +0000 (-0400)
Subject: ring-buffer: fix ret in rb_add_time_stamp
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f57a8a1911342265e7acdc190333c4e9235a6632;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

ring-buffer: fix ret in rb_add_time_stamp

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>
---

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 22878b0d370c..2e642b2b7253 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -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;