d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Untangle vfsinit() a bit. Use seperate sysinit functions rather than

Browse Source 
having a super-function calling bits all over the place.
This commit is contained in:
Peter Wemm 2000-12-06 07:09:08 +00:00
parent 7ca7bbb36b
commit 138e514cb5
6 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_cache.c
View File

@ -346,13 +346,15 @@ cache_enter(dvp, vp, cnp)
/*
* Name cache initialization, from vfs_init() when we are booting
*/
void
nchinit()
static void
nchinit(void *dummy __unused)
{
TAILQ_INIT(&ncneg);
nchashtbl = hashinit(desiredvnodes*2, M_VFSCACHE, &nchash);
nchashtbl = hashinit(desiredvnodes * 2, M_VFSCACHE, &nchash);
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nchinit, NULL)
/*
* Invalidate all entries to a particular vnode.

6
sys/kern/vfs_export.c
View File

@ -244,8 +244,8 @@ static int vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep,
/*
* Initialize the vnode management data structures.
*/
void
vntblinit()
static void
vntblinit(void *dummy __unused)
{
desiredvnodes = maxproc + cnt.v_page_count / 4;
@ -263,6 +263,8 @@ vntblinit()
&syncer_mask);
syncer_maxdelay = syncer_mask + 1;
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL)
/*
* Mark a mount point as busy. Used to synchronize access and to delay

25
sys/kern/vfs_init.c
View File

@ -53,15 +53,9 @@
MALLOC_DEFINE(M_VNODE, "vnodes", "Dynamically allocated vnodes");
/*
* Zone for namei
* The highest defined VFS number.
*/
struct vm_zone *namei_zone;
/*
* vfs_init() will set maxvfsconf
* to the highest defined type number.
*/
int maxvfsconf;
int maxvfsconf = VFS_GENERIC + 1;
struct vfsconf *vfsconf;
/*
@ -304,22 +298,7 @@ static void
vfsinit(void *dummy)
{
namei_zone = zinit("NAMEI", MAXPATHLEN, 0, 0, 2);
/*
* Initialize the vnode table
*/
vntblinit();
/*
* Initialize the vnode name cache
*/
nchinit();
/*
* Initialize each file system type.
* Vfs type numbers must be distinct from VFS_GENERIC (and VFS_VFSCONF).
*/
vattr_null(&va_null);
maxvfsconf = VFS_GENERIC + 1;
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL)

14
sys/kern/vfs_lookup.c
View File

@ -43,6 +43,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/mount.h>
@ -55,6 +56,19 @@
#include <vm/vm_zone.h>
/*
* Allocation zone for namei
*/
struct vm_zone *namei_zone;
static void
nameiinit(void *dummy __unused)
{
namei_zone = zinit("NAMEI", MAXPATHLEN, 0, 0, 2);
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL)
/*
* Convert a pathname into a pointer to a locked inode.
*

6
sys/kern/vfs_subr.c
View File

@ -244,8 +244,8 @@ static int vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep,
/*
* Initialize the vnode management data structures.
*/
void
vntblinit()
static void
vntblinit(void *dummy __unused)
{
desiredvnodes = maxproc + cnt.v_page_count / 4;
@ -263,6 +263,8 @@ vntblinit()
&syncer_mask);
syncer_maxdelay = syncer_mask + 1;
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL)
/*
* Mark a mount point as busy. Used to synchronize access and to delay

2
sys/sys/systm.h
View File

@ -181,9 +181,7 @@ void adjust_timeout_calltodo __P((struct timeval *time_change));
/* Initialize the world */
void consinit __P((void));
void cpu_initclocks __P((void));
void nchinit __P((void));
void usrinfoinit __P((void));
void vntblinit __P((void));
/* Finalize the world. */
void shutdown_nice __P((int));