From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130411202552.386927342@goodmis.org> Date: Thu, 11 Apr 2013 16:25:41 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [ 038/171 ] tracing: Keep overwrite in sync between regular and snapshot buffers References: <20130411202503.783159048@goodmis.org> Content-Disposition: inline; filename=0038-tracing-Keep-overwrite-in-sync-between-regular-and-s.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.2 stable review patch. If anyone has any objections, please let me know. ------------------ From: "Steven Rostedt (Red Hat)" [ Upstream commit 80902822658aab18330569587cdb69ac1dfdcea8 ] Changing the overwrite mode for the ring buffer via the trace option only sets the normal buffer. But the snapshot buffer could swap with it, and then the snapshot would be in non overwrite mode and the normal buffer would be in overwrite mode, even though the option flag states otherwise. Keep the two buffers overwrite modes in sync. Cc: stable@vger.kernel.org Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 06b227d..1f84103 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2791,8 +2791,12 @@ static void set_tracer_flags(unsigned int mask, int enabled) if (mask == TRACE_ITER_RECORD_CMD) trace_event_enable_cmd_record(enabled); - if (mask == TRACE_ITER_OVERWRITE) + if (mask == TRACE_ITER_OVERWRITE) { ring_buffer_change_overwrite(global_trace.buffer, enabled); +#ifdef CONFIG_TRACER_MAX_TRACE + ring_buffer_change_overwrite(max_tr.buffer, enabled); +#endif + } } static ssize_t -- 1.7.10.4