lkml.org 
[lkml]   [2015]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 048/142] tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING
    Date
    From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit c5e691928bf166ac03430e957038b60adba3cf6c upstream.

    When a event PADDING is hit (a deleted event that is still in the ring
    buffer), translate_data() sets the length of the padding and also updates
    the data pointer which is passed back to the caller.

    This is unneeded because the caller also updates the data pointer with
    the passed back length. translate_data() should not update the pointer,
    only set the length.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: http://lkml.kernel.org/r/20150324135923.461431960@goodmis.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    tools/lib/traceevent/kbuffer-parse.c | 1 -
    1 file changed, 1 deletion(-)

    diff --git a/tools/lib/traceevent/kbuffer-parse.c b/tools/lib/traceevent/kbuffer-parse.c
    index dcc665228c71..deb3569ab004 100644
    --- a/tools/lib/traceevent/kbuffer-parse.c
    +++ b/tools/lib/traceevent/kbuffer-parse.c
    @@ -372,7 +372,6 @@ translate_data(struct kbuffer *kbuf, void *data, void **rptr,
    switch (type_len) {
    case KBUFFER_TYPE_PADDING:
    *length = read_4(kbuf, data);
    - data += *length;
    break;

    case KBUFFER_TYPE_TIME_EXTEND:
    --
    2.3.7


    \
     
     \ /
      Last update: 2015-05-16 10:41    [W:4.031 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site