Updated both nfsd-probes.stp and rpc-probes.stp

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

2 files changed, 7 insertions, 26 deletions

diff --git a/nfsd-probes.stp b/nfsd-probes.stp
index 692eee9..c435d91 100644
--- a/nfsd-probes.stp
+++ b/nfsd-probes.stp
@@ -1,23 +1,4 @@
 /*
-%{
-#include <net/sock.h>
-#include <net/inet_hashtables.h>
-#include <linux/in.h>
-%}
-
-function _inet_ntoa:string (_uaddr:long) %{
-    struct sockaddr_in *addr;
-    unsigned char *bytes;
-
-    addr = (struct sockaddr_in *)(long)kread(&THIS->_uaddr);
-    bytes = (unsigned char *)&addr->sin_addr.s_addr;
-
-    snprintf(THIS->__retvalue, MAXSTRINGLEN,
-        "%d.%d.%d.%d:%d", bytes[0], bytes[1], bytes[2], bytes[3],
-        addr->sin_port);
-
-    CATCH_DEREF_FAULT();
-%}
 probe nfsd.dispatch {
 	printf("%s: ip %s proto %d vers %d\n", name, client_ip, proto, version);
 	printf("%s: xid %d prog %d proc %d\n", name, xid, prog, proc);
@@ -26,12 +7,6 @@ probe nfsd.dispatch.return {
 	if ($return)
 		printf("%s: %s\n", name, retstr);
 }
-probe nfsd.proc.entries {
-	printf("%s:\n", name);
-}
-probe nfsd.proc.return {
-	printf("%s: %s %d\n", name, retstr, $return);
-}
 probe nfsd.proc2.lookup {
 	printf("%s: ip 0x%x proto %d fh 0x%x filename %s\n", 
 	name, client_ip, proto, fh, filename);
@@ -116,6 +91,12 @@ probe nfsd.proc.rename.return {
 		printf("%s: %s\n", name, retstr);
 }
 */
+probe nfsd.proc.entries {
+	printf("%s:\n", name);
+}
+probe nfsd.proc.return {
+	printf("%s: %s %d\n", name, retstr, $return);
+}
 probe nfsd.entries {
 	printf("%s: ip %s %s\n", name, client_ip, argstr);
 }
diff --git a/rpc-probes.stp b/rpc-probes.stp
index 48f7d67..5661ae9 100644
--- a/rpc-probes.stp
+++ b/rpc-probes.stp
@@ -15,6 +15,7 @@ probe sunrpc.clnt.create_client {
 probe sunrpc.clnt.create_client.return {
 		printf("%s: retstr %s\n", name, retstr);
 }
+*/
 probe sunrpc.entry {
 	printf("%s: %s\n", name, argstr) 
 }
@@ -27,7 +28,6 @@ probe sunrpc.clnt.entry {
 probe sunrpc.clnt.return {
 		printf("%s: %s\n", name, retstr);
 }
-*/
 probe sunrpc.sched.entry {
 	printf("%s: %s\n", name, argstr) 
 }