Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / kernel / trace / ring_buffer.c

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index a56e07c..7a4104c 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -34,21 +34,19 @@ static void update_pages_handler(struct work_struct *work);
  */
 int ring_buffer_print_entry_header(struct trace_seq *s)
 {
-       int ret;
-
-       ret = trace_seq_puts(s, "# compressed entry header\n");
-       ret = trace_seq_puts(s, "\ttype_len    :    5 bits\n");
-       ret = trace_seq_puts(s, "\ttime_delta  :   27 bits\n");
-       ret = trace_seq_puts(s, "\tarray       :   32 bits\n");
-       ret = trace_seq_putc(s, '\n');
-       ret = trace_seq_printf(s, "\tpadding     : type == %d\n",
-                              RINGBUF_TYPE_PADDING);
-       ret = trace_seq_printf(s, "\ttime_extend : type == %d\n",
-                              RINGBUF_TYPE_TIME_EXTEND);
-       ret = trace_seq_printf(s, "\tdata max type_len  == %d\n",
-                              RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
+       trace_seq_puts(s, "# compressed entry header\n");
+       trace_seq_puts(s, "\ttype_len    :    5 bits\n");
+       trace_seq_puts(s, "\ttime_delta  :   27 bits\n");
+       trace_seq_puts(s, "\tarray       :   32 bits\n");
+       trace_seq_putc(s, '\n');
+       trace_seq_printf(s, "\tpadding     : type == %d\n",
+                        RINGBUF_TYPE_PADDING);
+       trace_seq_printf(s, "\ttime_extend : type == %d\n",
+                        RINGBUF_TYPE_TIME_EXTEND);
+       trace_seq_printf(s, "\tdata max type_len  == %d\n",
+                        RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
 
-       return ret;
+       return !trace_seq_has_overflowed(s);
 }
 
 /*
@@ -419,32 +417,31 @@ static inline int test_time_stamp(u64 delta)
 int ring_buffer_print_page_header(struct trace_seq *s)
 {
        struct buffer_data_page field;
-       int ret;
-
-       ret = trace_seq_printf(s, "\tfield: u64 timestamp;\t"
-                              "offset:0;\tsize:%u;\tsigned:%u;\n",
-                              (unsigned int)sizeof(field.time_stamp),
-                              (unsigned int)is_signed_type(u64));
-
-       ret = trace_seq_printf(s, "\tfield: local_t commit;\t"
-                              "offset:%u;\tsize:%u;\tsigned:%u;\n",
-                              (unsigned int)offsetof(typeof(field), commit),
-                              (unsigned int)sizeof(field.commit),
-                              (unsigned int)is_signed_type(long));
-
-       ret = trace_seq_printf(s, "\tfield: int overwrite;\t"
-                              "offset:%u;\tsize:%u;\tsigned:%u;\n",
-                              (unsigned int)offsetof(typeof(field), commit),
-                              1,
-                              (unsigned int)is_signed_type(long));
-
-       ret = trace_seq_printf(s, "\tfield: char data;\t"
-                              "offset:%u;\tsize:%u;\tsigned:%u;\n",
-                              (unsigned int)offsetof(typeof(field), data),
-                              (unsigned int)BUF_PAGE_SIZE,
-                              (unsigned int)is_signed_type(char));
 
-       return ret;
+       trace_seq_printf(s, "\tfield: u64 timestamp;\t"
+                        "offset:0;\tsize:%u;\tsigned:%u;\n",
+                        (unsigned int)sizeof(field.time_stamp),
+                        (unsigned int)is_signed_type(u64));
+
+       trace_seq_printf(s, "\tfield: local_t commit;\t"
+                        "offset:%u;\tsize:%u;\tsigned:%u;\n",
+                        (unsigned int)offsetof(typeof(field), commit),
+                        (unsigned int)sizeof(field.commit),
+                        (unsigned int)is_signed_type(long));
+
+       trace_seq_printf(s, "\tfield: int overwrite;\t"
+                        "offset:%u;\tsize:%u;\tsigned:%u;\n",
+                        (unsigned int)offsetof(typeof(field), commit),
+                        1,
+                        (unsigned int)is_signed_type(long));
+
+       trace_seq_printf(s, "\tfield: char data;\t"
+                        "offset:%u;\tsize:%u;\tsigned:%u;\n",
+                        (unsigned int)offsetof(typeof(field), data),
+                        (unsigned int)BUF_PAGE_SIZE,
+                        (unsigned int)is_signed_type(char));
+
+       return !trace_seq_has_overflowed(s);
 }
 
 struct rb_irq_work {