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/nwfs | |
| parent | 645b8b81f004da9bf1d09dd4707177be1640f1f9 (diff) | |
Notes
Diffstat (limited to 'sys/nwfs')
| -rw-r--r-- | sys/nwfs/nwfs_node.c | 1 | ||||
| -rw-r--r-- | sys/nwfs/nwfs_vnops.c | 16 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sys/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c index 2d3460093bc7e..03d3e86b5cfd1 100644 --- a/sys/nwfs/nwfs_node.c +++ b/sys/nwfs/nwfs_node.c @@ -83,6 +83,7 @@ nwfs_hash_init(void) { void nwfs_hash_free(void) { + lockdestroy(&nwhashlock); free(nwhashtbl, M_NWFSHASH); } diff --git a/sys/nwfs/nwfs_vnops.c b/sys/nwfs/nwfs_vnops.c index e309785e8aac3..e7c7fa6d41194 100644 --- a/sys/nwfs/nwfs_vnops.c +++ b/sys/nwfs/nwfs_vnops.c @@ -46,6 +46,8 @@ #include <vm/vm.h> #include <vm/vm_extern.h> +#include <machine/mutex.h> + #include <netncp/ncp.h> #include <netncp/ncp_conn.h> #include <netncp/ncp_subr.h> @@ -255,24 +257,24 @@ nwfs_close(ap) if (vp->v_type == VDIR) return 0; /* nothing to do now */ error = 0; - simple_lock(&vp->v_interlock); + mtx_enter(&vp->v_interlock, MTX_DEF); if (np->opened == 0) { - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); return 0; } - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); error = nwfs_vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 1); - simple_lock(&vp->v_interlock); + mtx_enter(&vp->v_interlock, MTX_DEF); if (np->opened == 0) { - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); return 0; } if (--np->opened == 0) { - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); error = ncp_close_file(NWFSTOCONN(VTONWFS(vp)), &np->n_fh, ap->a_p, ap->a_cred); } else - simple_unlock(&vp->v_interlock); + mtx_exit(&vp->v_interlock, MTX_DEF); np->n_atime = 0; return (error); } |