From ac9876d609290ddd585a1e5a67550061f01c20dd Mon Sep 17 00:00:00 2001 From: dillon Date: Thu, 20 Dec 2001 22:42:27 +0000 Subject: 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 --- sys/fs/nwfs/nwfs_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/fs/nwfs/nwfs_node.c') diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 8fce6ac..d6f8788 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -185,7 +185,7 @@ rescan: if (dvp) { np->n_parent = VTONW(dvp)->n_fid; } - lockinit(&vp->v_lock, PINOD, "nwnode", 0, LK_CANRECURSE); + lockinit(&vp->v_lock, PINOD, "nwnode", VLKTIMEOUT, LK_CANRECURSE); lockmgr(&nwhashlock, LK_EXCLUSIVE, NULL, td); /* * Another process can create vnode while we blocked in malloc() or -- cgit v1.1