Correct block IO and IO scheduler tapset and test case

* tapset/ioblock.stp: Update comment and variables.
* testsuite/buildok/ioblock_test.stp: Add parameters.
* testsuite/buildok/ioscheduler.stp: Remove redundant parameters.

3 files changed, 4 insertions, 12 deletions

diff --git a/tapset/ioblock.stp b/tapset/ioblock.stp
index 1bc06699..707fad4c 100644
--- a/tapset/ioblock.stp
+++ b/tapset/ioblock.stp
@@ -178,8 +178,6 @@ probe ioblock.end = kernel.function("bio_endio")
 /**
  * probe ioblock_trace.bounce - Fires whenever a buffer bounce is needed for at least one page of a block IO request.
  *
- *  @bio       struct bio *
- *  @q         struct request_queue*
  *  @devname    device for which a buffer bounce was needed.
  *  @ino       - i-node number of the mapped file
  *  @bytes_done - number of bytes transferred
@@ -193,7 +191,6 @@ probe ioblock.end = kernel.function("bio_endio")
  *      BIO_BOUNCED     5       bio is a bounce bio
  *      BIO_USER_MAPPED 6       contains user pages
  *      BIO_EOPNOTSUPP  7       not supported
- *  @error     - 0 on success
  *  @rw        - binary trace for read/write request
  *  @vcnt      - bio vector count which represents number of array element (page, offset, length) which makes up this I/O request
  *  @idx       - offset into the bio vector array
@@ -221,10 +218,9 @@ probe ioblock_trace.bounce = kernel.trace("block_bio_bounce")
 /**
  * probe ioblock_trace.request - Fires just as a generic block I/O request is created for a bio.
  *
- *  @bio       struct bio* for which IO request is to be submitted
- *  @q         struct request_queue* to which the request is to be added
  *  @devname   - block device name
  *  @ino       - i-node number of the mapped file
+ *  @bytes_done - number of bytes transferred
  *  @sector    - beginning sector for the entire bio
  *  @flags     - see below
  *	BIO_UPTODATE    0       ok after I/O completion
@@ -255,7 +251,6 @@ probe ioblock_trace.request = kernel.trace("block_bio_queue")
         ino = __bio_ino($bio)
 
         bytes_done = $bio->bi_size
-        error = $error
         sector = $bio->bi_sector
         flags = $bio->bi_flags
         rw = $bio->bi_rw
@@ -286,7 +281,6 @@ probe ioblock_trace.request = kernel.trace("block_bio_queue")
  *      BIO_USER_MAPPED 6       contains user pages
  *      BIO_EOPNOTSUPP  7       not supported
 
- *  @error     - 0 on success
  *  @rw        - binary trace for read/write request
  *  @vcnt      - bio vector count which represents number of array element (page, offset, length) which makes up this I/O request
  *  @idx       - offset into the bio vector array
@@ -303,7 +297,6 @@ probe ioblock_trace.end = kernel.trace("block_bio_complete")
         ino = __bio_ino($bio)
 
         bytes_done = $bio->bi_size
-        error = $error
 
         sector = $bio->bi_sector
         flags = $bio->bi_flags
diff --git a/testsuite/buildok/ioblock_test.stp b/testsuite/buildok/ioblock_test.stp
index 55237994..21595021 100755
--- a/testsuite/buildok/ioblock_test.stp
+++ b/testsuite/buildok/ioblock_test.stp
@@ -29,6 +29,6 @@ probe ioblock.end {
 probe ioblock_trace.*
 {
   log(pp())
-  printf("%s\t%p\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
-                devname, q, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, bytes_done, error, ino)
+  printf("%s\t%d\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%p\t%p\t%d\n",
+                devname, q, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, bytes_done, ino, p_start_sect, bdev_contains, bdev)
 }
diff --git a/testsuite/buildok/ioscheduler.stp b/testsuite/buildok/ioscheduler.stp
index 55ef9a0f..8b377619 100755
--- a/testsuite/buildok/ioscheduler.stp
+++ b/testsuite/buildok/ioscheduler.stp
@@ -16,7 +16,6 @@ probe ioscheduler_trace.elv*
 
 probe ioscheduler_trace.plug, ioscheduler_trace.unplug_io, ioscheduler_trace.unplug_timer
 {
-        printf("ppname: %s, request %p, elv_name: %s, %d, %d", probefunc(),
-                rq_queue)
+        printf("ppname: %s, request %p", probefunc(), rq_queue)
 }