From: Mark Wielaard <mwielaard@redhat.com>
Date: Thu, 8 May 2008 11:48:11 +0000 (+0200)
Subject: In ioblock.stp ioblock.end set bytes_done depending on kernel version.
X-Git-Tag: release-0.7-rc1~177
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5341054cc6cbe0ecc05947b59c12820a34635e1b;p=systemtap.git

In ioblock.stp ioblock.end set bytes_done depending on kernel version.
---

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index cf41c9cbc..70d75b838 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-08  Ananth N Mavinakayanahalli <ananth@in.ibm.com>
+
+	PR 5231
+	* ioblock.stp (ioblock.end): Set bytes_done depending on kernel
+	version.
+	
 2008-04-29  Frank Ch. Eigler  <fche@elastic.org>
 	
 	PR 6466
diff --git a/tapset/ioblock.stp b/tapset/ioblock.stp
index 94781c041..14ce3f6ba 100644
--- a/tapset/ioblock.stp
+++ b/tapset/ioblock.stp
@@ -167,7 +167,7 @@ probe ioblock.end = kernel.function("bio_endio")
         devname = __bio_devname($bio)
         ino = __bio_ino($bio)
 
-        bytes_done = $bytes_done
+        bytes_done = %( kernel_vr < "2.6.24" %? $bytes_done %: $bio->bi_size %)
         error = $error
 
         sector = $bio->bi_sector