Fix: blktrace instrumentation for backported branches

[lttng-modules.git] / instrumentation / events / lttng-module / block.h

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index 2af4fb326ba911e2d686a932069d0cd54e68fdc8..9d3de7d903a8167dc7694554c7eb109962ceb08c 100644 (file)
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -221,7 +221,11 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
        TP_ARGS(q, rq)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,5)      \
+       || LTTNG_KERNEL_RANGE(3,12,21, 3,13,0)          \
+       || LTTNG_KERNEL_RANGE(3,10,41, 3,11,0)          \
+       || LTTNG_KERNEL_RANGE(3,4,91, 3,5,1)            \
+       || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0))
 
 /**
  * block_rq_complete - block IO operation completed by device driver
@@ -557,8 +561,8 @@ TRACE_EVENT(block_bio_queue,
                __field( dev_t,         dev                     )
                __field( sector_t,      sector                  )
                __field( unsigned int,  nr_sector               )
-               __array( char,          rwbs,   RWBS_LEN        )
-               __array( char,          comm,   TASK_COMM_LEN   )
+               __field( unsigned int,  rwbs                    )
+               __array_text( char,             comm,   TASK_COMM_LEN   )
        ),
 
        TP_fast_assign(