From 5dca6b354c0a54e91c0966b019c9dbc06cfa505c Mon Sep 17 00:00:00 2001
From: zhaolei <zhaolei>
Date: Fri, 2 Nov 2007 06:29:33 +0000
Subject: [PATCH] 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.
---
 tapset/nfs_proc.stp | 16 ++++++++++++++++
 tapset/nfsd.stp     |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/tapset/nfs_proc.stp b/tapset/nfs_proc.stp
index af57a14e2..6ec2572ec 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 92a85cf10..52add6909 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
-- 
2.43.5