diff options
| -rw-r--r-- | tapset/ChangeLog | 4 | ||||
| -rw-r--r-- | tapset/vfs.stp | 9 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 6 | ||||
| -rwxr-xr-x | testsuite/buildok/seven.stp | 2 | ||||
| -rwxr-xr-x | testsuite/buildok/seventeen.stp | 4 |
5 files changed, 25 insertions, 0 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 27d4a60b..19fa3b03 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2008-08-03 Wenji Huang <wenji.huang@oracle.com> + + * vfs.stp(add_to_page_cache): Correct for 2.6.27. + 2008-07-25 Zhaolei <zhaolei@cn.fujitsu.com> * syscalls2.stp: Add sys_unlinkat. diff --git a/tapset/vfs.stp b/tapset/vfs.stp index 46bc3d21..1ea8fc8e 100644 --- a/tapset/vfs.stp +++ b/tapset/vfs.stp @@ -744,7 +744,11 @@ probe vfs.do_mpage_readpage.return = kernel.function ("do_mpage_readpage").retur units = "pages" } +%( kernel_v > "2.6.26" %? +probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache_locked") +%: probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache") +%) { dev = $mapping->host->i_sb->s_dev devname = __find_bdevname(dev, $mapping->host->i_sb->s_bdev) @@ -756,7 +760,12 @@ probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache") name = "vfs.add_to_page_cache" argstr = sprintf("%d, %d", ino, index) } + +%( kernel_v > "2.6.26" %? +probe vfs.add_to_page_cache.return = kernel.function ("add_to_page_cache_locked").return +%: probe vfs.add_to_page_cache.return = kernel.function ("add_to_page_cache").return +%) { name = "vfs.add_to_page_cache" retstr = sprintf("%d", $return) diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index af44d6c8..67d741e5 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,9 @@ + +2008-08-03 Wenji Huang <wenji.huang@oracle.com> + + * buildok/seven.stp: Correct for 2.6.27. + * buildok/seventeen.stp: Ditto. + 2008-07-29 Dave Brolley <brolley@redhat.com> * Makefile.am (SYSTEMTAP_PATH): Add $(EXTRA_SYSTEMTAP_PATH). diff --git a/testsuite/buildok/seven.stp b/testsuite/buildok/seven.stp index d6f6e5a9..dc3bc786 100755 --- a/testsuite/buildok/seven.stp +++ b/testsuite/buildok/seven.stp @@ -6,6 +6,7 @@ # first: enums and ints +%( kernel_v <= "2.6.26" %? probe kernel.function("find_pid") { %( kernel_v >= "2.6.17" %? @@ -15,6 +16,7 @@ probe kernel.function("find_pid") . sprint($nr) . ")") %) } +%) # second: opaque pointers and enums diff --git a/testsuite/buildok/seventeen.stp b/testsuite/buildok/seventeen.stp index 9adffa48..e4a7a8e8 100755 --- a/testsuite/buildok/seventeen.stp +++ b/testsuite/buildok/seventeen.stp @@ -5,5 +5,9 @@ probe kernel.function("pipe_write") { +%( kernel_v > "2.6.26" %? + printf("0x%x\n", $write_pipefifo_fops->llseek) +%: printf("0x%x\n", $write_fifo_fops->llseek) +%) } |