Add DTrace support to the new NFS client. This is essentially

cloned from the old NFS client, plus additions for NFSv4. A
review of this code is in progress, however it was felt by the
reviewer that it could go in now, before code slush. Any changes
required by the review can be committed as bug fixes later.

1 files changed, 22 insertions, 3 deletions

diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 15e1be9..eb348b2 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -100,54 +100,73 @@ typedef	void (*dtrace_malloc_probe_func_t)(u_int32_t, uintptr_t arg0,
 
 extern dtrace_malloc_probe_func_t   dtrace_malloc_probe;
 
-/* dtnfsclient NFSv3 access cache provider hooks. */
+/* dtnfsclient NFSv[34] access cache provider hooks. */
 typedef void (*dtrace_nfsclient_accesscache_flush_probe_func_t)(uint32_t,
     struct vnode *);
 extern dtrace_nfsclient_accesscache_flush_probe_func_t
     dtrace_nfsclient_accesscache_flush_done_probe;
+extern dtrace_nfsclient_accesscache_flush_probe_func_t
+    dtrace_nfscl_accesscache_flush_done_probe;
 
 typedef void (*dtrace_nfsclient_accesscache_get_probe_func_t)(uint32_t,
     struct vnode *, uid_t, uint32_t);
 extern dtrace_nfsclient_accesscache_get_probe_func_t
     dtrace_nfsclient_accesscache_get_hit_probe,
     dtrace_nfsclient_accesscache_get_miss_probe;
+extern dtrace_nfsclient_accesscache_get_probe_func_t
+    dtrace_nfscl_accesscache_get_hit_probe,
+    dtrace_nfscl_accesscache_get_miss_probe;
 
 typedef void (*dtrace_nfsclient_accesscache_load_probe_func_t)(uint32_t,
     struct vnode *, uid_t, uint32_t, int);
 extern dtrace_nfsclient_accesscache_load_probe_func_t
     dtrace_nfsclient_accesscache_load_done_probe;
+extern dtrace_nfsclient_accesscache_load_probe_func_t
+    dtrace_nfscl_accesscache_load_done_probe;
 
-/* dtnfsclient NFSv[23] attribute cache provider hooks. */
+/* dtnfsclient NFSv[234] attribute cache provider hooks. */
 typedef void (*dtrace_nfsclient_attrcache_flush_probe_func_t)(uint32_t,
     struct vnode *);
 extern dtrace_nfsclient_attrcache_flush_probe_func_t
     dtrace_nfsclient_attrcache_flush_done_probe;
+extern dtrace_nfsclient_attrcache_flush_probe_func_t
+    dtrace_nfscl_attrcache_flush_done_probe;
 
 typedef void (*dtrace_nfsclient_attrcache_get_hit_probe_func_t)(uint32_t,
     struct vnode *, struct vattr *);
 extern dtrace_nfsclient_attrcache_get_hit_probe_func_t
     dtrace_nfsclient_attrcache_get_hit_probe;
+extern dtrace_nfsclient_attrcache_get_hit_probe_func_t
+    dtrace_nfscl_attrcache_get_hit_probe;
 
 typedef void (*dtrace_nfsclient_attrcache_get_miss_probe_func_t)(uint32_t,
     struct vnode *);
 extern dtrace_nfsclient_attrcache_get_miss_probe_func_t
     dtrace_nfsclient_attrcache_get_miss_probe;
+extern dtrace_nfsclient_attrcache_get_miss_probe_func_t
+    dtrace_nfscl_attrcache_get_miss_probe;
 
 typedef void (*dtrace_nfsclient_attrcache_load_probe_func_t)(uint32_t,
     struct vnode *, struct vattr *, int);
 extern dtrace_nfsclient_attrcache_load_probe_func_t
     dtrace_nfsclient_attrcache_load_done_probe;
+extern dtrace_nfsclient_attrcache_load_probe_func_t
+    dtrace_nfscl_attrcache_load_done_probe;
 
-/* dtnfsclient NFSv[23] RPC provider hooks. */
+/* dtnfsclient NFSv[234] RPC provider hooks. */
 typedef void (*dtrace_nfsclient_nfs23_start_probe_func_t)(uint32_t,
     struct vnode *, struct mbuf *, struct ucred *, int);
 extern dtrace_nfsclient_nfs23_start_probe_func_t
     dtrace_nfsclient_nfs23_start_probe;
+extern dtrace_nfsclient_nfs23_start_probe_func_t
+    dtrace_nfscl_nfs234_start_probe;
 
 typedef void (*dtrace_nfsclient_nfs23_done_probe_func_t)(uint32_t,
     struct vnode *, struct mbuf *, struct ucred *, int, int);
 extern dtrace_nfsclient_nfs23_done_probe_func_t
     dtrace_nfsclient_nfs23_done_probe;
+extern dtrace_nfsclient_nfs23_done_probe_func_t
+    dtrace_nfscl_nfs234_done_probe;
 
 /*
  * Functions which allow the dtrace module to check that the kernel