From: Steve Dickson <steved@redhat.com>
Date: Tue, 23 Feb 2010 16:47:19 +0000 (-0500)
Subject: Updated nfsd.proc.read probes
X-Git-Tag: release-1.2~80
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ea1d5e79a012e94c23809c6e81495e88a680ca9b;p=systemtap.git

Updated nfsd.proc.read probes

Converted the nfsd.proc.read probes to used
the @cast() mechanism.

Created the nfsd.proc4.read probes

Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/tapset/nfsd.stp b/tapset/nfsd.stp
index 92f682fb8..84f1c5621 100644
--- a/tapset/nfsd.stp
+++ b/tapset/nfsd.stp
@@ -197,7 +197,7 @@ probe nfsd.proc4.lookup.return = kernel.function("nfsd4_lookup").return !,
 {
 	name = "nfsd.proc4.lookup.return"
 	version = 4
-	retstr = sprintf("%s",nfsderror($return))
+	retstr = sprintf("%s", nfsderror($return))
 }
 
 /*
@@ -217,11 +217,13 @@ probe nfsd.proc4.lookup.return = kernel.function("nfsd4_lookup").return !,
 *  vlen : read blocks 
 */
 probe nfsd.proc.read = nfsd.proc2.read,
-                       nfsd.proc3.read
+                       nfsd.proc3.read,
+                       nfsd.proc4.read
 {}
 
 probe nfsd.proc.read.return = nfsd.proc2.read.return,
-                       nfsd.proc3.read.return
+                       nfsd.proc3.read.return,
+                       nfsd.proc4.read.return
 {
 
 }
@@ -232,7 +234,7 @@ probe nfsd.proc2.read = kernel.function("nfsd_proc_read")!,
 	client_ip =  addr_from_rqst($rqstp)
 	proto = $rqstp->rq_prot
         version = 2
-	fh = __get_fh($argp,3)
+	fh = & @cast($argp, "nfsd_readargs", "kernel:nfsd")->fh
 
 	count = $argp->count 
 	offset = $argp->offset 
@@ -246,8 +248,8 @@ probe nfsd.proc2.read = kernel.function("nfsd_proc_read")!,
 	name = "nfsd.proc2.read"
 	argstr = sprintf("%d,%d",count,offset)
 
-        size = count
-        units = "bytes"
+	size = count
+	units = "bytes"
 }
 
  
@@ -256,7 +258,7 @@ probe nfsd.proc2.read.return = kernel.function("nfsd_proc_read").return!,
 {
 	name = "nfsd.proc2.read.return"
 	version = 2
-	retstr = sprintf("%d",$return)
+	retstr = sprintf("%s", nfsderror($return))
 }
 
 probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")!,
@@ -264,8 +266,8 @@ probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")!,
 {
 	client_ip =  addr_from_rqst($rqstp)
 	proto = $rqstp->rq_prot
-        version = 3
-	fh = __get_fh($argp,4)
+	version = 3
+	fh = & @cast($argp, "nfsd3_readargs", "kernel:nfsd")->fh
 
 	count = $argp->count 
 	offset = $argp->offset 
@@ -279,8 +281,8 @@ probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")!,
 	name = "nfsd.proc3.read"
 	argstr = sprintf("%d,%d",count,offset)
 
-        size = count
-        units = "bytes"
+	size = count
+	units = "bytes"
 }
 
  
@@ -289,7 +291,34 @@ probe nfsd.proc3.read.return = kernel.function("nfsd3_proc_read").return!,
 {
 	name = "nfsd.proc3.read.return"
 	version = 3
-	retstr = sprintf("%d",$return)
+	retstr = sprintf("%s", nfsderror($return))
+}
+
+probe nfsd.proc4.read = kernel.function("nfsd4_read") !,
+                          module("nfsd").function("nfsd4_read") ?
+{
+	client_ip = addr_from_rqst($rqstp)
+	proto = $rqstp->rq_prot
+	version = 4
+	fh = & @cast($cstate, "nfsd4_compound_state", "kernel:nfsd")->current_fh
+
+	count = $read->rd_length
+	offset = $read->rd_offset
+	vec = $read->rd_vlen
+
+	name = "nfsd.proc4.read"
+	argstr = sprintf("%d,%d",count,offset)
+
+	size = count
+	units = "bytes"
+}
+
+probe nfsd.proc4.read.return = kernel.function("nfsd4_read").return!,
+                        module("nfsd").function("nfsd4_read").return?
+{
+	name = "nfsd.proc4.read.return"
+	version = 4
+	retstr = sprintf("%s", nfsderror($return))
 }
 
 /*