39c39
< * $FreeBSD: head/sys/kern/vfs_export.c 71411 2001-01-23 04:15:19Z rwatson $
---
> * $FreeBSD: head/sys/kern/vfs_export.c 71576 2001-01-24 12:35:55Z jasone $
155c155,156
< struct simplelock mntvnode_slock;
---
> struct mtx mntvnode_mtx;
>
162d162
< #ifndef NULL_SIMPLELOCKS
164c164
< static struct simplelock mntid_slock;
---
> static struct mtx mntid_mtx;
167c167
< static struct simplelock vnode_free_list_slock;
---
> static struct mtx vnode_free_list_mtx;
173,174c173
< static struct simplelock spechash_slock;
< #endif
---
> static struct mtx spechash_mtx;
253,255c252,254
< simple_lock_init(&mntvnode_slock);
< simple_lock_init(&mntid_slock);
< simple_lock_init(&spechash_slock);
---
> mtx_init(&mntvnode_mtx, "mntvnode", MTX_DEF);
> mtx_init(&mntid_mtx, "mntid", MTX_DEF);
> mtx_init(&spechash_mtx, "spechash", MTX_DEF);
257c256
< simple_lock_init(&vnode_free_list_slock);
---
> mtx_init(&vnode_free_list_mtx, "vnode_free_list", MTX_DEF);
426c425
< simple_lock(&mntid_slock);
---
> mtx_enter(&mntid_mtx, MTX_DEF);
439c438
< simple_unlock(&mntid_slock);
---
> mtx_exit(&mntid_mtx, MTX_DEF);
542c541
< simple_lock(&vnode_free_list_slock);
---
> mtx_enter(&vnode_free_list_mtx, MTX_DEF);
582c581
< simple_unlock(&vnode_free_list_slock);
---
> mtx_exit(&vnode_free_list_mtx, MTX_DEF);
613c612
< simple_unlock(&vnode_free_list_slock);
---
> mtx_exit(&vnode_free_list_mtx, MTX_DEF);
617a617
> mtx_init(&vp->v_pollinfo.vpi_lock, "vnode pollinfo", MTX_DEF);
649c649
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
659c659
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
663c663
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
1405c1405
< simple_lock(&spechash_slock);
---
> mtx_enter(&spechash_mtx, MTX_DEF);
1407c1407
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
1631c1631
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
1670c1670
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
1672c1672
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
1682c1682
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
1690c1690
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
1700c1700
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
1845c1845
< simple_lock(&spechash_slock);
---
> mtx_enter(&spechash_mtx, MTX_DEF);
1847c1847
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
1862c1862
< struct simplelock *inter_lkp;
---
> struct mtx *inter_lkp;
1869c1869
< simple_unlock(inter_lkp);
---
> mtx_exit(inter_lkp, MTX_DEF);
1929c1929
< simple_lock(&spechash_slock);
---
> mtx_enter(&spechash_mtx, MTX_DEF);
1932c1932
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
1948c1948
< simple_lock(&vnode_free_list_slock);
---
> mtx_enter(&vnode_free_list_mtx, MTX_DEF);
1955c1955
< simple_unlock(&vnode_free_list_slock);
---
> mtx_exit(&vnode_free_list_mtx, MTX_DEF);
1974c1974
< simple_lock(&spechash_slock);
---
> mtx_enter(&spechash_mtx, MTX_DEF);
1978c1978
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
1982c1982
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
1997c1997
< simple_lock(&spechash_slock);
---
> mtx_enter(&spechash_mtx, MTX_DEF);
2000c2000
< simple_unlock(&spechash_slock);
---
> mtx_exit(&spechash_mtx, MTX_DEF);
2207c2207
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
2217c2217
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
2221c2221
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
2225c2225
< simple_lock(&mntvnode_slock);
---
> mtx_enter(&mntvnode_mtx, MTX_DEF);
2227c2227
< simple_unlock(&mntvnode_slock);
---
> mtx_exit(&mntvnode_mtx, MTX_DEF);
2636c2636
< simple_lock(&vnode_free_list_slock);
---
> mtx_enter(&vnode_free_list_mtx, MTX_DEF);
2644c2644
< simple_unlock(&vnode_free_list_slock);
---
> mtx_exit(&vnode_free_list_mtx, MTX_DEF);
2660c2660
< simple_lock(&vnode_free_list_slock);
---
> mtx_enter(&vnode_free_list_mtx, MTX_DEF);
2664c2664
< simple_unlock(&vnode_free_list_slock);
---
> mtx_exit(&vnode_free_list_mtx, MTX_DEF);
2683c2683
< simple_lock(&vp->v_pollinfo.vpi_lock);
---
> mtx_enter(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2695c2695
< simple_unlock(&vp->v_pollinfo.vpi_lock);
---
> mtx_exit(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2700c2700
< simple_unlock(&vp->v_pollinfo.vpi_lock);
---
> mtx_exit(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2715c2715
< simple_lock(&vp->v_pollinfo.vpi_lock);
---
> mtx_enter(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2732c2732
< simple_unlock(&vp->v_pollinfo.vpi_lock);
---
> mtx_exit(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2744c2744
< simple_lock(&vp->v_pollinfo.vpi_lock);
---
> mtx_enter(&vp->v_pollinfo.vpi_lock, MTX_DEF);
2749c2749
< simple_unlock(&vp->v_pollinfo.vpi_lock);
---
> mtx_exit(&vp->v_pollinfo.vpi_lock, MTX_DEF);