<html><body><div style="font-family: times new roman, new york, times, serif; font-size: 12pt; color: #000000"><div><br></div><hr id="zwchr"><blockquote style="border-left:2px solid #1010FF;margin-left:5px;padding-left:5px;color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><b>From: </b>"Antoine Busque" <antoine.busque@efficios.com><br><b>To: </b>lttng-dev@lists.lttng.org<br><b>Sent: </b>Friday, June 6, 2014 6:00:59 PM<br><b>Subject: </b>[lttng-dev] [PATCH lttng-modules] Fix: blktrace instrumentation for backported branches<br><div><br></div><div dir="ltr">The following commit from kernel 3.15 changing the API of a block layer<br>tracepoint has been backported to multiple branches:<br><div><br></div>commit af5040da01ef980670b3741b3e10733ee3e33566<br>Author: Roman Pen <<a href="mailto:r.peniaev@gmail.com" target="_blank">r.peniaev@gmail.com</a>><br>
Date: Tue Mar 4 23:13:10 2014 +0900<br><div><br></div> blktrace: fix accounting of partially completed requests<br><div><br></div>This patch fixes the resulting build failure by adding the proper<br>version checks. The versions and corresponding commit SHA-1 hashes are<br>
as follow:<br><div><br></div> 3.2.58<br> commit 5b85afa68e4f56c27f1d5c6f49e5257bce6448e6<br><div><br></div> 3.4.91<br> commit 14eee5bd065d6aac0acbdc6092a25ba68c55b9c8<br><div><br></div> 3.10.41<br> commit e9d933941569c107e0083c3c115467c699a57db2<br><br> 3.12.21<br> commit 5104b40a981d26212ced149fbd43ad0b6b72910b<br><div><br></div> 3.14.15<br> commit 0a8eda9c00ef37e8b40de77f2b0714317191bcf2<br><div><br></div>Signed-off-by: Antoine Busque <<a href="mailto:antoine.busque@efficios.com" target="_blank">antoine.busque@efficios.com</a>><br>
---<br> instrumentation/events/lttng-module/block.h | 7 +++++--<br> 1 file changed, 5 insertions(+), 2 deletions(-)<br><div><br></div>diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h<br>
index 4f3460e..5684153 100644<br>--- a/instrumentation/events/lttng-module/block.h<br>+++ b/instrumentation/events/lttng-module/block.h<br>@@ -221,8 +221,11 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,<br> TP_ARGS(q, rq)<br>
)<br><br>-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) \<br>- || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0))<br>+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,5) \<br>+ || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0) \<br>
+ || LTTNG_KERNEL_RANGE(3,4,91, 3,5,1) \<br>+ || LTTNG_KERNEL_RANGE(3,10,41, 3,11,0) \<br>+ || LTTNG_KERNEL_RANGE(3,12,21, 3,13,0))</div></blockquote><div>It looks like your mail client turns tabs into spaces. Can you fix and re-send ?<br></div><div><br></div><div>thanks,<br></div><div><br></div><div>Mathieu<br></div><div><br></div><div><br></div><blockquote style="border-left:2px solid #1010FF;margin-left:5px;padding-left:5px;color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><div dir="ltr"><br><br> /**<br> * block_rq_complete - block IO operation completed by device driver<br>
-- <br>2.0.0<br><div><br></div><br></div><br>_______________________________________________<br>lttng-dev mailing list<br>lttng-dev@lists.lttng.org<br>http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev<br></blockquote><div><br><br></div><div><br></div><div>-- <br></div><div><span name="x"></span>Mathieu Desnoyers<br>EfficiOS Inc.<br>http://www.efficios.com<span name="x"></span><br></div></div></body></html>