From db9aa81e239bb1c46b3b7ba560474cd954b78bf3 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 4 Apr 2002 21:03:38 +0000 Subject: Change callers of mtx_init() to pass in an appropriate lock type name. In most cases NULL is passed, but in some cases such as network driver locks (which use the MTX_NETWORK_LOCK macro) and UMA zone locks, a name is used. Tested on: i386, alpha, sparc64 --- sys/kern/vfs_subr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys/kern/vfs_subr.c') diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7967b04..a48b138 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -258,7 +258,7 @@ void v_addpollinfo(struct vnode *vp) { vp->v_pollinfo = uma_zalloc(vnodepoll_zone, M_WAITOK); - mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", MTX_DEF); + mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", NULL, MTX_DEF); } /* @@ -270,12 +270,12 @@ vntblinit(void *dummy __unused) desiredvnodes = maxproc + cnt.v_page_count / 4; minvnodes = desiredvnodes / 4; - mtx_init(&mountlist_mtx, "mountlist", MTX_DEF); - mtx_init(&mntvnode_mtx, "mntvnode", MTX_DEF); - mtx_init(&mntid_mtx, "mntid", MTX_DEF); - mtx_init(&spechash_mtx, "spechash", MTX_DEF); + mtx_init(&mountlist_mtx, "mountlist", NULL, MTX_DEF); + mtx_init(&mntvnode_mtx, "mntvnode", NULL, MTX_DEF); + mtx_init(&mntid_mtx, "mntid", NULL, MTX_DEF); + mtx_init(&spechash_mtx, "spechash", NULL, MTX_DEF); TAILQ_INIT(&vnode_free_list); - mtx_init(&vnode_free_list_mtx, "vnode_free_list", MTX_DEF); + mtx_init(&vnode_free_list_mtx, "vnode_free_list", NULL, MTX_DEF); vnode_zone = uma_zcreate("VNODE", sizeof (struct vnode), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); vnodepoll_zone = uma_zcreate("VNODEPOLL", sizeof (struct vpollinfo), @@ -888,7 +888,7 @@ getnewvnode(tag, mp, vops, vpp) mtx_unlock(&vnode_free_list_mtx); vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK); bzero((char *) vp, sizeof *vp); - mtx_init(&vp->v_interlock, "vnode interlock", MTX_DEF); + mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF); vp->v_dd = vp; cache_purge(vp); LIST_INIT(&vp->v_cache_src); -- cgit v1.1