diff options
| author | Jason Evans <jasone@FreeBSD.org> | 2000-10-04 01:29:17 +0000 |
|---|---|---|
| committer | Jason Evans <jasone@FreeBSD.org> | 2000-10-04 01:29:17 +0000 |
| commit | a18b1f1d4ddeb48bde093cc8a8ecf5d48391a03c (patch) | |
| tree | be38329315e26593acf6a8b824bb4069d9701eba /sys/miscfs | |
| parent | 645b8b81f004da9bf1d09dd4707177be1640f1f9 (diff) | |
Notes
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_subr.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/union/union_subr.c | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index f9907331dd8c..ab6678f52d8e 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -41,6 +41,8 @@ #include <sys/vnode.h> #include <sys/poll.h> +#include <machine/mutex.h> + static int chkvnlock __P((struct vnode *)); /* * Prototypes for dead operations on vnodes. @@ -210,7 +212,7 @@ dead_lock(ap) * the interlock here. */ if (ap->a_flags & LK_INTERLOCK) { - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); ap->a_flags &= ~LK_INTERLOCK; } if (!chkvnlock(vp)) diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index efb1357e2c35..b5df78c627a2 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -92,8 +92,10 @@ nullfs_uninit(vfsp) struct vfsconf *vfsp; { - if (null_node_hashtbl) + if (null_node_hashtbl) { + lockdestroy(&null_hashlock); free(null_node_hashtbl, M_NULLFSHASH); + } return (0); } diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index d1d6e31f7056..9d342819fc4f 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -637,6 +637,7 @@ union_freevp(vp) free(un->un_path, M_TEMP); un->un_path = NULL; } + lockdestroy(&un->un_lock); FREE(vp->v_data, M_TEMP); vp->v_data = 0; |