summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorpluknet <pluknet@FreeBSD.org>2013-11-26 22:41:40 +0000
committerpluknet <pluknet@FreeBSD.org>2013-11-26 22:41:40 +0000
commitd8bfc5ed878dcd580c4ebeca9f97e803a6ff4800 (patch)
tree10a7a153496c42f24435609f498339a1f259240a /sys/fs
parentc0a9aba061167e42446e582501ef61e0037b0884 (diff)
downloadFreeBSD-src-d8bfc5ed878dcd580c4ebeca9f97e803a6ff4800.zip
FreeBSD-src-d8bfc5ed878dcd580c4ebeca9f97e803a6ff4800.tar.gz
- 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.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfsclient/nfs_kdtrace.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/fs/nfsclient/nfs_kdtrace.h b/sys/fs/nfsclient/nfs_kdtrace.h
index e6c05f0..93eca7a 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 <sys/dtrace_bsd.h>
@@ -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)( \
OpenPOWER on IntegriCloud