diff options
| author | dillon <dillon@FreeBSD.org> | 2001-12-20 22:42:27 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 2001-12-20 22:42:27 +0000 |
| commit | ac9876d609290ddd585a1e5a67550061f01c20dd (patch) | |
| tree | 74464ed2703c6925992ebe509294859864e96118 /sys/kern/vfs_subr.c | |
| parent | 53b1a7ecefc98fa3a2e71925a3be359d4873214b (diff) | |
| download | FreeBSD-src-ac9876d609290ddd585a1e5a67550061f01c20dd.zip FreeBSD-src-ac9876d609290ddd585a1e5a67550061f01c20dd.tar.gz | |
Fix a BUF_TIMELOCK race against BUF_LOCK and fix a deadlock in vget()
against VM_WAIT in the pageout code. Both fixes involve adjusting
the lockmgr's timeout capability so locks obtained with timeouts do not
interfere with locks obtained without a timeout.
Hopefully MFC: before the 4.5 release
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index d5dd6aa..7ccad17 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -793,7 +793,7 @@ getnewvnode(tag, mp, vops, vpp) vp->v_type = VNON; vp->v_tag = tag; vp->v_op = vops; - lockinit(&vp->v_lock, PVFS, "vnlock", 0, LK_NOPAUSE); + lockinit(&vp->v_lock, PVFS, "vnlock", VLKTIMEOUT, LK_NOPAUSE); insmntque(vp, mp); *vpp = vp; vp->v_usecount = 1; |
