From 741a71187b87c4111d1626e7c59cdbcd9103b579 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Wed, 28 Jul 2010 10:42:53 -0400
Subject: Added nfsd4_secinfo_namelen and nfsd4_secinfo_name functions

---
 nfsd/nfsd4_secinfo.stp   |  9 +++++++--
 tapset/nfsd4_secinfo.stp | 11 +++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/nfsd/nfsd4_secinfo.stp b/nfsd/nfsd4_secinfo.stp
index aa91a26..0b0ae41 100644
--- a/nfsd/nfsd4_secinfo.stp
+++ b/nfsd/nfsd4_secinfo.stp
@@ -2,9 +2,12 @@ global check_exp, check_rqstp_flavor
 
 probe module("nfsd").function("nfsd4_secinfo")
 {
-	printf("nfsd4_secinfo: rqstp %p fh %p secinfo %p\n", 
-		$rqstp, $current_fh, $secinfo);
+	printf("nfsd4_secinfo: rqstp %p secinfo %p\n", $rqstp, $secinfo);
+	printf("             : secinfo: name(%d)%s\n", 
+		nfsd4_secinfo_namelen($secinfo), nfsd4_secinfo_name($secinfo));
+	/*
 	printf("             : %s\n", nfsd4_secinfo_dump($secinfo));
+	*/
 }
 probe module("nfsd").function("nfsd4_secinfo").return
 {
@@ -37,6 +40,7 @@ probe module("nfsd").function("nfsd4_decode_secinfo").return
 {
 	printf("nfsd4_decode_secinfo: %s\n", nfsderror($return));
 }
+/*
 probe module("nfsd").function("secinfo_parse")
 {
 	printf("secinfo_parse: %s\n", svc_export_dump($exp));
@@ -45,6 +49,7 @@ probe module("nfsd").function("secinfo_parse").return
 {
 	printf("secinfo_parse: %s\n", nfsderror($return));
 }
+*/
 probe module("nfsd").function("nfsd_lookup")
 {
 	printf("nfsd_lookup: rqstp %p fhp %p name %s\n", 
diff --git a/tapset/nfsd4_secinfo.stp b/tapset/nfsd4_secinfo.stp
index bdedcce..d9c0446 100644
--- a/tapset/nfsd4_secinfo.stp
+++ b/tapset/nfsd4_secinfo.stp
@@ -2,7 +2,9 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/cache.h>
 
+/*
 #include <linux/nfsd/nfsd.h>
+*/
 #include <linux/nfsd/export.h>
 #include <linux/nfsd/nfsfh.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
@@ -11,6 +13,14 @@
 #endif
 %}
 
+function nfsd4_secinfo_namelen:long (secinfo:long ) { 
+	return @cast(secinfo, "nfsd4_secinfo", "kernel:nfsd")->si_namelen
+}
+function nfsd4_secinfo_name:string (secinfo:long) { 
+	return kernel_string(@cast(secinfo, "nfsd4_secinfo", "kernel:nfsd")->si_name)
+}
+
+/*
 function nfsd4_secinfo_dump:string(_secinfo:long)
 %{
 	struct nfsd4_secinfo *secinfo = 
@@ -32,3 +42,4 @@ function nfsd4_secinfo_dump:string(_secinfo:long)
 
 	CATCH_DEREF_FAULT();
 %}
+*/
-- 
cgit