Merge branch 'master' of ssh://kenistoj@sources.redhat.com/git/systemtap

5 files changed, 15 insertions, 8 deletions

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 8d434357..a43e32a7 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-24  William Cohen  <wcohen@redhat.com>
+
+	* io/traceio.stp:
+	* io/traceio2.stp:
+	* io/iotop.stp:
+	* io/disktop.stp: Use vfs tapset rather than kernel functions probes.
+	
 2008-09-12  Frank Ch. Eigler  <fche@elastic.org>
 
 	* io/traceio2.stp: Make compatible with RHEL5.
diff --git a/testsuite/systemtap.examples/io/disktop.stp b/testsuite/systemtap.examples/io/disktop.stp
index 2637d735..e2c4fc3b 100755
--- a/testsuite/systemtap.examples/io/disktop.stp
+++ b/testsuite/systemtap.examples/io/disktop.stp
@@ -14,7 +14,7 @@
 global io_stat,device
 global read_bytes,write_bytes
 
-probe kernel.function("vfs_read").return {
+probe vfs.read.return {
 	if ($return>0) {
 		dev = __file_dev($file)
 		devname = __find_bdevname(dev,__file_bdev($file))
@@ -27,7 +27,7 @@ probe kernel.function("vfs_read").return {
 	}
 }
 
-probe kernel.function("vfs_write").return {
+probe vfs.write.return {
 	if ($return>0) {
 		dev = __file_dev($file)
 		devname = __find_bdevname(dev,__file_bdev($file))
diff --git a/testsuite/systemtap.examples/io/iotop.stp b/testsuite/systemtap.examples/io/iotop.stp
index 2fa3e3ae..f868169b 100755
--- a/testsuite/systemtap.examples/io/iotop.stp
+++ b/testsuite/systemtap.examples/io/iotop.stp
@@ -2,11 +2,11 @@
 
 global reads, writes, total_io
 
-probe kernel.function("vfs_read") {
+probe vfs.read {
     reads[execname()] += $count
 }
 
-probe kernel.function("vfs_write") {
+probe vfs.write {
     writes[execname()] += $count
 }
 
diff --git a/testsuite/systemtap.examples/io/traceio.stp b/testsuite/systemtap.examples/io/traceio.stp
index cb667be5..4ca4dd4c 100755
--- a/testsuite/systemtap.examples/io/traceio.stp
+++ b/testsuite/systemtap.examples/io/traceio.stp
@@ -9,11 +9,11 @@
 
 global reads, writes, total_io
 
-probe kernel.function("vfs_read").return {
+probe vfs.read.return {
 	reads[execname()] += $return
 }
 
-probe kernel.function("vfs_write").return {
+probe vfs.write.return {
 	writes[execname()] += $return
 }
 
diff --git a/testsuite/systemtap.examples/io/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp
index 988ea36c..91445d3e 100755
--- a/testsuite/systemtap.examples/io/traceio2.stp
+++ b/testsuite/systemtap.examples/io/traceio2.stp
@@ -9,8 +9,8 @@ probe begin {
   device_of_interest = MKDEV(MAJOR(dev), MINOR(dev))
 }
 
-probe kernel.function ("vfs_write"),
-      kernel.function ("vfs_read")
+probe vfs.write,
+      vfs.read
 {
         dev_nr = $file->
              	%( kernel_v < "2.6.19" %? f_dentry %: f_path->dentry %)