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

5 files changed, 44 insertions, 0 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index f242c310..11cdea4c 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,21 @@
+2007-11-2  Zhaolei  <zhaolei@cn.fujitsu.com>
+
+	From Cai Fei <caifei@cn.fujitsu.com>
+	* nfsd.stp: Fix the semantic error caused by the difference of
+	kernel versions.
+	* nfs_proc.stp: Ditto.
+
+2007-11-1  Will Cohen  <wcohen@redhat.com>
+
+	* syscall2.stp (sys_remap_file_pages): Fix compile error with kernel
+	version greater than 2.6.23.
+
+2007-11-1  Zhaolei  <zhaolei@cn.fujitsu.com>
+
+	From Lai Jiangshan <laijs@cn.fujitsu.com>
+	* rpc.stp (clones_from_clnt): Add CATCH_DEREF_FAULT().
+	(tasks_from_clnt): Ditto.
+
 2007-10-17  Martin Hunt  <hunt@redhat.com>
 	PR5000
 	* endian.stp (set_endian): Remove.
diff --git a/tapset/nfs_proc.stp b/tapset/nfs_proc.stp
index af57a14e..6ec2572e 100644
--- a/tapset/nfs_proc.stp
+++ b/tapset/nfs_proc.stp
@@ -770,7 +770,9 @@ probe nfs.proc2.read_done.return = kernel.function("nfs_read_done").return?,
 {
         version =2
 	name = "nfs.proc2.read_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 
@@ -799,7 +801,9 @@ probe nfs.proc3.read_done.return = kernel.function("nfs3_read_done").return?,
 {
         version =3
 	name = "nfs.proc3.read_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 
@@ -830,7 +834,9 @@ probe nfs.proc4.read_done.return = kernel.function("nfs4_read_done").return?,
 {
         version =4
 	name = "nfs.proc4.read_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 /*probe nfs.proc.write_setup
@@ -990,7 +996,9 @@ probe nfs.proc2.write_done.return = kernel.function("nfs_write_done").return ?,
 {
         version =2
 	name = "nfs.proc2.write_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 probe nfs.proc3.write_done = kernel.function("nfs3_write_done") ?,
@@ -1019,7 +1027,9 @@ probe nfs.proc3.write_done.return = kernel.function("nfs3_write_done").return ?,
 {
         version =3
 	name = "nfs.proc3.write_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 probe nfs.proc4.write_done = kernel.function("nfs4_write_done") ?,
@@ -1050,7 +1060,9 @@ probe nfs.proc4.write_done.return = kernel.function("nfs4_write_done").return ?,
 {
         version =4
 	name = "nfs.proc4.write_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 
@@ -1182,7 +1194,9 @@ probe nfs.proc3.commit_done.return = kernel.function("nfs3_commit_done").return
 {
         version =3
 	name = "nfs.proc3.commit_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 
 probe nfs.proc4.commit_done = kernel.function("nfs4_commit_done") ?,
@@ -1213,7 +1227,9 @@ probe nfs.proc4.commit_done.return = kernel.function("nfs4_commit_done").return
 {
         version =4
 	name = "nfs.proc4.commit_done.return"
+%( kernel_v >= "2.6.17" %?
 	retstr = sprintf("%d", $return)
+%)
 }
 /*probe nfs.proc.open
 *
diff --git a/tapset/nfsd.stp b/tapset/nfsd.stp
index 92a85cf1..52add690 100644
--- a/tapset/nfsd.stp
+++ b/tapset/nfsd.stp
@@ -809,7 +809,9 @@ probe nfsd.read = kernel.function("nfsd_read") ?,
 {
 	fh = __svc_fh($fhp)
 
+%( kernel_v >= "2.6.12" %?
 	file = $file
+%)
 	count = p_long($count)
 	offset = $offset
 	vec = $vec
@@ -847,7 +849,9 @@ probe nfsd.write = kernel.function("nfsd_write")?,
 {
 	fh = __svc_fh($fhp)
 
+%( kernel_v >= "2.6.12" %?
 	file = $file
+%)
 	count = $cnt
 	offset = $offset
 	vec = $vec
diff --git a/tapset/rpc.stp b/tapset/rpc.stp
index eecdb796..38f53401 100644
--- a/tapset/rpc.stp
+++ b/tapset/rpc.stp
@@ -949,6 +949,7 @@ function clones_from_clnt:long(clnt:long)
 	struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt;
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
 	THIS->__retvalue = kread(&(clnt->cl_count));
+	CATCH_DEREF_FAULT();
 #else
         THIS->__retvalue = -1;
 #endif
@@ -959,6 +960,7 @@ function tasks_from_clnt:long(clnt:long)
 	struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt;
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
 	THIS->__retvalue = kread(&(clnt->cl_users));
+	CATCH_DEREF_FAULT();
 #else
         THIS->__retvalue = -1;
 #endif
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index e702bbcd..aa22377c 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -784,7 +784,11 @@ probe syscall.remap_file_pages = kernel.function("sys_remap_file_pages") ? {
 	name = "remap_file_pages"
 	start = $start
 	size = $size
+%( kernel_vr > "2.6.23" %?
+	prot = $prot
+%:
 	prot = $__prot
+%)
 	pgoff = $pgoff
 	flags = $flags
 	argstr = sprintf("%p, %p, %p, %p, %p", start, size, prot,