From 60585a2db9ba0618406ecc6b5d87a07e6574dcb6 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Mon, 22 Nov 2010 16:07:11 -0500
Subject: [PATCH] Revert "PR12254: make ioblock.* probes tolerate 0-byte I/O
 (e.g. blkdev_issue_flush)"

This reverts commit d213fd5908edce8c730f08524eae15bc26d62187.
It's not necessary, as commit 3963dacdfe handles this already.
---
 tapset/ioblock.stp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tapset/ioblock.stp b/tapset/ioblock.stp
index a7377aabe..b078d7b47 100644
--- a/tapset/ioblock.stp
+++ b/tapset/ioblock.stp
@@ -72,7 +72,7 @@ global BIO_READ = 0, BIO_WRITE = 1
  *
  *  @name      - name of the probe point
  *  @devname   - block device name
- *  @ino       - i-node number of the mapped file, -1 for 0-byte I/O
+ *  @ino       - i-node number of the mapped file
  *  @sector    - beginning sector for the entire bio
  *  @flags     - see below
  *  	BIO_UPTODATE    0       ok after I/O completion
@@ -101,7 +101,7 @@ probe ioblock.request = kernel.function ("generic_make_request")
 {
 	name = "ioblock.request"
         devname = __bio_devname($bio)
-        ino = $bio->bi_vcnt ? __bio_ino($bio) : -1;
+        ino = __bio_ino($bio)
 
         sector = $bio->bi_sector
         flags = $bio->bi_flags
@@ -123,7 +123,7 @@ probe ioblock.request = kernel.function ("generic_make_request")
  *
  *  @name      - name of the probe point
  *  @devname   - block device name
- *  @ino       - i-node number of the mapped file, -1 for 0-byte I/O
+ *  @ino       - i-node number of the mapped file
  *  @bytes_done - number of bytes transferred
  *  @sector    - beginning sector for the entire bio
  *  @flags     - see below
@@ -150,7 +150,7 @@ probe ioblock.end = kernel.function("bio_endio")
 {
 	name = "ioblock.end"
         devname = __bio_devname($bio)
-        ino = $bio->bi_vcnt ? __bio_ino($bio) : -1;
+        ino = __bio_ino($bio)
 
         bytes_done = (@defined($bytes_done) ? $bytes_done : $bio->bi_size)
         error = $error
@@ -201,7 +201,7 @@ probe ioblock_trace.bounce = kernel.trace("block_bio_bounce")
 	name = "ioblock_trace.bounce"
 	q = $q
         devname = __bio_devname($bio)
-        ino = $bio->bi_vcnt ? __bio_ino($bio) : -1;
+        ino = __bio_ino($bio)
 
         bytes_done = $bio->bi_size
         sector = $bio->bi_sector
@@ -253,7 +253,7 @@ probe ioblock_trace.request = kernel.trace("block_bio_queue")
 	name = "ioblock_trace.request"
 	q = $q
         devname = __bio_devname($bio)
-        ino = $bio->bi_vcnt ? __bio_ino($bio) : -1;
+        ino = __bio_ino($bio)
 
         bytes_done = $bio->bi_size
         sector = $bio->bi_sector
@@ -304,7 +304,7 @@ probe ioblock_trace.end = kernel.trace("block_bio_complete")
 	name = "ioblock_trace.end"
 	q = $q
         devname = __bio_devname($bio)
-        ino = $bio->bi_vcnt ? __bio_ino($bio) : -1;
+        ino = __bio_ino($bio)
 
         bytes_done = $bio->bi_size
 
-- 
2.43.5