block-update-2.patch

   1 From cf0b616277b7be6950243bc6cdad172af073ff0a Mon Sep 17 00:00:00 2001
   2 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   3 Date: Sat, 3 May 2014 15:07:42 -0400
   4 Subject: [PATCH] Fix: blktrace instrumentation for v3.2.58+ stable branch
   5
   6 Starting with Linux kernel v3.2.58 within the v3.2 Linux stable branch:
   7
   8 commit 5b85afa68e4f56c27f1d5c6f49e5257bce6448e6
   9 Author: Roman Pen <r.peniaev@gmail.com>
  10 Date:   Tue Mar 4 23:13:10 2014 +0900
  11
  12     blktrace: fix accounting of partially completed requests
  13
  14     commit af5040da01ef980670b3741b3e10733ee3e33566 upstream.
  15
  16 The module API for a block layer tracepoint changes. Fix the associated
  17 build failure.
  18
  19 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  20 ---
  21  instrumentation/events/lttng-module/block.h |    3 ++-
  22  probes/lttng-probe-block.c                  |    1 +
  23  2 files changed, 3 insertions(+), 1 deletion(-)
  24
  25 diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
  26 index 2af4fb3..5ea557d 100644
  27 --- a/instrumentation/events/lttng-module/block.h
  28 +++ b/instrumentation/events/lttng-module/block.h
  29 @@ -221,7 +221,8 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
  30         TP_ARGS(q, rq)
  31  )
  32
  33 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
  34 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)      \
  35 +       || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0) || LTTNG_KERNEL_RANGE(3,4,91, 3,5,0))
  36
  37  /**
  38   * block_rq_complete - block IO operation completed by device driver
  39 diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c
  40 index 27f2142..d363d4d 100644
  41 --- a/probes/lttng-probe-block.c
  42 +++ b/probes/lttng-probe-block.c
  43 @@ -23,6 +23,7 @@
  44  #include <linux/module.h>
  45  #include <linux/blktrace_api.h>
  46  #include "../lttng-tracer.h"
  47 +#include "../lttng-kernel-version.h"
  48
  49  /*
  50   * Create the tracepoint static inlines from the kernel to validate that our
  51 --
  52 1.7.10.4
  53