Module Name: src
Committed By: pooka
Date: Sun Jan 4 19:31:00 UTC 2015
Modified Files:
src/sys/kern: vfs_cache.c
Log Message:
initialize sysctl node from init() instead of via linkset
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/kern/vfs_cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.103 src/sys/kern/vfs_cache.c:1.104
--- src/sys/kern/vfs_cache.c:1.103 Wed Dec 24 20:01:21 2014
+++ src/sys/kern/vfs_cache.c Sun Jan 4 19:31:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.103 2014/12/24 20:01:21 dennis Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.104 2015/01/04 19:31:00 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.103 2014/12/24 20:01:21 dennis Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.104 2015/01/04 19:31:00 pooka Exp $");
#include "opt_ddb.h"
#include "opt_revcache.h"
@@ -258,6 +258,9 @@ static void cache_reclaim(void);
static int cache_ctor(void *, void *, int);
static void cache_dtor(void *, void *);
+static struct sysctllog *sysctllog;
+static void sysctl_cache_stat_setup(void);
+
/*
* Compute the hash for an entry.
*
@@ -885,6 +888,8 @@ nchinit(void)
"namecache", "under scan target");
evcnt_attach_dynamic(&cache_ev_forced, EVCNT_TYPE_MISC, NULL,
"namecache", "forced reclaims");
+
+ sysctl_cache_stat_setup();
}
static int
@@ -1250,9 +1255,12 @@ cache_stat_sysctl(SYSCTLFN_ARGS)
return sysctl_copyout(l, &stats, oldp, sizeof(stats));
}
-SYSCTL_SETUP(sysctl_cache_stat_setup, "vfs.namecache_stats subtree setup")
+static void
+sysctl_cache_stat_setup(void)
{
- sysctl_createv(clog, 0, NULL, NULL,
+
+ KASSERT(sysctllog == NULL);
+ sysctl_createv(&sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, "namecache_stats",
SYSCTL_DESCR("namecache statistics"),
