Added more callback and mounting routines

2 files changed, 18 insertions, 12 deletions

diff --git a/nfsd/nfsd4_callback.stp b/nfsd/nfsd4_callback.stp
index b0defc6..3853271 100644
--- a/nfsd/nfsd4_callback.stp
+++ b/nfsd/nfsd4_callback.stp
@@ -1,32 +1,38 @@
 probe module("nfsd").function("nfsd4_probe_callback")
 {
-	printf("nfsd4_probe_callback: clp %p\n", $clp);
+	printf("nfsd4_probe_callback: client %s\n", nfs4_callback_addr($clp));
 }
+/*
 probe module("nfsd").function("nfsd4_setclientid_confirm")
 {
 	printf("nfsd4_setclientid_confirm: hellow\n");
 }
-/*
 probe module("nfsd").function("*@fs/nfsd/nfs4state.c:3318")
 {
 	printf("nfsd4_setclientid_confirm: hellow\n");
 }
-*/
-probe module("nfsd").function("nfsd4_setclientid_confirm").return
+probe module("nfsd").function("*@fs/nfsd/nfs4callback.c")
 {
-	printf("nfsd4_setclientid_confirm: status %d\n", $return);
+	printf("%s\n", probefunc());
 }
-probe module("nfsd").function("nfsd4_process_open2").return
+*/
+probe module("nfsd").function("nfsd4_cb_probe_done")
 {
-	printf("nfsd4_process_open2: status %d\n", $return);
+	terror = task_status($task);
+	if (terror)
+		printf("nfsd4_cb_probe_done: client %s: error %d (%s)\n", 
+			cl_server($task), terror, errno_str(terror));
 }
-probe module("nfsd").function("svc_export_parse").return
+probe module("nfsd").function("nfsd4_setclientid_confirm").return
 {
-	printf("svc_export_parse: status %d\n", $return);
+	if ($return)
+		printf("nfsd4_setclientid_confirm: status %d\n", $return);
 }
-probe module("sunrpc").function("rpc_exit_task")
+probe module("nfsd").function("nfsd4_process_open2").return
 {
-	printf("rpc_exit_task: task 0x%p\n", $task);
+	if ($return)
+		printf("nfsd4_process_open2: status %d\n", $return);
 }
+
 probe begin { log("starting probe") }
 probe end { log("ending probe") }
diff --git a/nfsd/nfsd_exports.stp b/nfsd/nfsd_exports.stp
index ec73af8..fb0cacb 100644
--- a/nfsd/nfsd_exports.stp
+++ b/nfsd/nfsd_exports.stp
@@ -59,6 +59,7 @@ probe module("sunrpc").function("cache_check").return
 	if ($return)
 		printf("                 cache_check: %s\n", errno_str($return));
 }
+/*
 probe module("sunrpc").function("cache_make_upcall")
 {
 	printf("                 cache_make_upcall: detail %p h %p \n", 
@@ -70,7 +71,6 @@ probe module("sunrpc").function("cache_make_upcall").return
 	if ($return)
 		printf("                 cache_make_upcall: %s\n", errno_str($return));
 }
-/*
 probe module("nfsd").function("check_nfsd_access")
 {
 	check_exp = $exp;