From 0d8dc7cc39b967d392e969b98dfcc1e9c187a095 Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Tue, 26 Nov 2013 22:41:40 +0000 Subject: [PATCH] - Nuke a second copy of nfscl_attrcache extern declarations from under ifdef KDTRACE_HOOKS. This fixes kernel build with options KDTRACE_HOOKS. - Fix style inconsistencies. --- sys/fs/nfsclient/nfs_kdtrace.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sys/fs/nfsclient/nfs_kdtrace.h b/sys/fs/nfsclient/nfs_kdtrace.h index e6c05f0bb423..93eca7aca197 100644 --- a/sys/fs/nfsclient/nfs_kdtrace.h +++ b/sys/fs/nfsclient/nfs_kdtrace.h @@ -39,13 +39,14 @@ extern uint32_t nfscl_accesscache_flush_done_id; extern uint32_t nfscl_accesscache_get_hit_id; extern uint32_t nfscl_accesscache_get_miss_id; extern uint32_t nfscl_accesscache_load_done_id; + /* * Definitions for NFS attribute cache probes. */ -extern uint32_t nfscl_attrcache_flush_done_id; -extern uint32_t nfscl_attrcache_get_hit_id; -extern uint32_t nfscl_attrcache_get_miss_id; -extern uint32_t nfscl_attrcache_load_done_id; +extern uint32_t nfscl_attrcache_flush_done_id; +extern uint32_t nfscl_attrcache_get_hit_id; +extern uint32_t nfscl_attrcache_get_miss_id; +extern uint32_t nfscl_attrcache_load_done_id; #ifdef KDTRACE_HOOKS #include @@ -77,14 +78,6 @@ extern uint32_t nfscl_attrcache_load_done_id; (rmode), (error)); \ } while (0) -/* - * Definitions for NFS attribute cache probes. - */ -extern uint32_t nfscl_attrcache_flush_done_id; -extern uint32_t nfscl_attrcache_get_hit_id; -extern uint32_t nfscl_attrcache_get_miss_id; -extern uint32_t nfscl_attrcache_load_done_id; - #define KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp) do { \ if (dtrace_nfscl_attrcache_flush_done_probe != NULL) \ (dtrace_nfscl_attrcache_flush_done_probe)( \