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

9 files changed, 10 insertions, 9 deletions

diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 8371246..e837f76 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -73,7 +73,7 @@ cd9660_init(vfsp)
 {
 
 	isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash);
-	mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", MTX_DEF);
+	mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", NULL, MTX_DEF);
 	return (0);
 }
 
diff --git a/sys/fs/hpfs/hpfs_hash.c b/sys/fs/hpfs/hpfs_hash.c
index 0a04a9a..2b6e74b 100644
--- a/sys/fs/hpfs/hpfs_hash.c
+++ b/sys/fs/hpfs/hpfs_hash.c
@@ -66,7 +66,7 @@ hpfs_hphashinit()
 
 	lockinit (&hpfs_hphash_lock, PINOD, "hpfs_hphashlock", 0, 0);
 	hpfs_hphashtbl = hashinit(desiredvnodes, M_HPFSHASH, &hpfs_hphash);
-	mtx_init(&hpfs_hphash_mtx, "hpfs hphash", MTX_DEF);
+	mtx_init(&hpfs_hphash_mtx, "hpfs hphash", NULL, MTX_DEF);
 }
 
 /*
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 05ae373..7550842 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -511,7 +511,7 @@ hpfs_vget(
 		vp->v_flag |= VROOT;
 
 
-	mtx_init(&hp->h_interlock, "hpfsnode interlock", MTX_DEF);
+	mtx_init(&hp->h_interlock, "hpfsnode interlock", NULL, MTX_DEF);
 	lockinit(&hp->h_lock, PINOD, "hpnode", VLKTIMEOUT, 0);
 
 	hp->h_flag = H_INVAL;
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 3a24b7c..7a0cf79 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -103,7 +103,7 @@ msdosfs_init(vfsp)
 	struct vfsconf *vfsp;
 {
 	dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash);
-	mtx_init(&dehash_mtx, "msdosfs dehash", MTX_DEF);
+	mtx_init(&dehash_mtx, "msdosfs dehash", NULL, MTX_DEF);
 	return (0);
 }
 
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index 89363f9..cb557f2 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -68,7 +68,7 @@ ntfs_nthashinit()
 {
 	lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0);
 	ntfs_nthashtbl = hashinit(desiredvnodes, M_NTFSNTHASH, &ntfs_nthash);
-	mtx_init(&ntfs_nthash_mtx, "ntfs nthash", MTX_DEF);
+	mtx_init(&ntfs_nthash_mtx, "ntfs nthash", NULL, MTX_DEF);
 }
 
 /*
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index dd9af4e..afb1862 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -404,7 +404,7 @@ ntfs_ntlookup(
 
 	/* init lock and lock the newborn ntnode */
 	lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE);
-	mtx_init(&ip->i_interlock, "ntnode interlock", MTX_DEF);
+	mtx_init(&ip->i_interlock, "ntnode interlock", NULL, MTX_DEF);
 	ntfs_ntget(ip);
 
 	ntfs_nthashins(ip);
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 6477bff..5b9a24f 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -313,7 +313,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc)
 	struct pfs_node *root;
 	int error;
 
-	mtx_init(&pi->pi_mutex, "pseudofs", MTX_DEF);
+	mtx_init(&pi->pi_mutex, "pseudofs", NULL, MTX_DEF);
 	
 	/* set up the root diretory */
 	MALLOC(root, struct pfs_node *, sizeof *root,
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 778ef1b..223ca9b 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -61,7 +61,7 @@ struct pfs_bitmap {
 void
 pfs_fileno_load(void)
 {
-	mtx_init(&pfs_fileno_mutex, "pseudofs_fileno", MTX_DEF);
+	mtx_init(&pfs_fileno_mutex, "pseudofs_fileno", NULL, MTX_DEF);
 }
 
 /*
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 00822f1..62ba7e0 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -78,7 +78,8 @@ extern vop_t **pfs_vnodeop_p;
 void
 pfs_vncache_load(void)
 {
-	mtx_init(&pfs_vncache_mutex, "pseudofs_vncache", MTX_DEF|MTX_RECURSE);
+	mtx_init(&pfs_vncache_mutex, "pseudofs_vncache", NULL,
+	    MTX_DEF | MTX_RECURSE);
 	/* XXX at_exit() can fail with ENOMEN */
 	at_exit(pfs_exit);
 }