diff options
author | Sergey Kandaurov <pluknet@FreeBSD.org> | 2013-11-26 22:41:40 +0000 |
---|---|---|
committer | Sergey Kandaurov <pluknet@FreeBSD.org> | 2013-11-26 22:41:40 +0000 |
commit | 0d8dc7cc39b967d392e969b98dfcc1e9c187a095 (patch) | |
tree | 10a7a153496c42f24435609f498339a1f259240a /sys/fs | |
parent | 285e7a2d97a9b2a13117aa0e1c9f75da7d7353b4 (diff) | |
download | src-0d8dc7cc39b967d392e969b98dfcc1e9c187a095.tar.gz src-0d8dc7cc39b967d392e969b98dfcc1e9c187a095.zip |
- 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.
Notes
Notes:
svn path=/head/; revision=258667
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/nfsclient/nfs_kdtrace.h | 17 |
1 files 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 <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)( \ |