diff options
| author | peter <peter@FreeBSD.org> | 1998-06-20 18:29:38 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-06-20 18:29:38 +0000 |
| commit | 9529c38ad8859b9f325867d97f266101f2c4dca3 (patch) | |
| tree | 7c9206c000e7ad493db842a3fecdf77deacb096a /contrib/ipfilter/mln_ipl.c | |
| parent | 58e3555d887b6a5b1f460d8ee84ca4e97c0a8217 (diff) | |
| download | FreeBSD-src-9529c38ad8859b9f325867d97f266101f2c4dca3.zip FreeBSD-src-9529c38ad8859b9f325867d97f266101f2c4dca3.tar.gz | |
Import trimmed version of ipfilter 3.2.7.
Obtained from: Darren Reed via http://cheops.anu.edu.au/~avalon/
Diffstat (limited to 'contrib/ipfilter/mln_ipl.c')
| -rw-r--r-- | contrib/ipfilter/mln_ipl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/ipfilter/mln_ipl.c b/contrib/ipfilter/mln_ipl.c index 3d70831..7f2166e 100644 --- a/contrib/ipfilter/mln_ipl.c +++ b/contrib/ipfilter/mln_ipl.c @@ -48,6 +48,9 @@ #include "ip_compat.h" #include "ip_fil.h" +#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103050000 +#define vn_lock(v,f) VOP_LOCK(v) +#endif #if !defined(VOP_LEASE) && defined(LEASE_CHECK) #define VOP_LEASE LEASE_CHECK @@ -179,7 +182,7 @@ static int ipl_remove() if ((error = namei(&nd))) return (error); VOP_LEASE(nd.ni_vp, curproc, curproc->p_ucred, LEASE_WRITE); - VOP_LOCK(nd.ni_vp); + vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY); VOP_LEASE(nd.ni_dvp, curproc, curproc->p_ucred, LEASE_WRITE); (void) VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd); } |
