Author: pluknet
Date: Tue Nov 26 22:41:40 2013
New Revision: 258667
URL: http://svnweb.freebsd.org/changeset/base/258667
Log:
- 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.
Modified:
head/sys/fs/nfsclient/nfs_kdtrace.h
Modified: head/sys/fs/nfsclient/nfs_kdtrace.h
==============================================================================
--- head/sys/fs/nfsclient/nfs_kdtrace.h Tue Nov 26 20:27:57 2013
(r258666)
+++ head/sys/fs/nfsclient/nfs_kdtrace.h Tue Nov 26 22:41:40 2013
(r258667)
@@ -39,13 +39,14 @@ extern uint32_t nfscl_accesscache_flush_
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_don
(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)( \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
