From owner-cvs-all Thu Dec 20 14:42:34 2001 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E077A37B405; Thu, 20 Dec 2001 14:42:27 -0800 (PST) Received: (from dillon@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fBKMgR986208; Thu, 20 Dec 2001 14:42:27 -0800 (PST) (envelope-from dillon) Message-Id: <200112202242.fBKMgR986208@freefall.freebsd.org> From: Matt Dillon Date: Thu, 20 Dec 2001 14:42:27 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/fs/hpfs hpfs_vfsops.c src/sys/fs/msdosfs msdosfs_denode.c src/sys/fs/ntfs ntfs_vfsops.c src/sys/fs/nwfs nwfs_node.c src/sys/fs/smbfs smbfs_node.c src/sys/fs/unionfs union_subr.c src/sys/kern kern_lock.c vfs_subr.c src/sys/sys buf.h ... X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG dillon 2001/12/20 14:42:27 PST Modified files: sys/fs/hpfs hpfs_vfsops.c sys/fs/msdosfs msdosfs_denode.c sys/fs/ntfs ntfs_vfsops.c sys/fs/nwfs nwfs_node.c sys/fs/smbfs smbfs_node.c sys/fs/unionfs union_subr.c sys/kern kern_lock.c vfs_subr.c sys/sys buf.h lockmgr.h vnode.h sys/ufs/ffs ffs_vfsops.c sys/ufs/ifs ifs_vfsops.c sys/vm vm_pageout.c Log: 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 Revision Changes Path 1.21 +1 -1 src/sys/fs/hpfs/hpfs_vfsops.c 1.59 +2 -2 src/sys/fs/msdosfs/msdosfs_denode.c 1.39 +1 -1 src/sys/fs/ntfs/ntfs_vfsops.c 1.22 +2 -2 src/sys/fs/nwfs/nwfs_node.c 1.5 +1 -1 src/sys/fs/smbfs/smbfs_node.c 1.56 +2 -2 src/sys/fs/unionfs/union_subr.c 1.53 +4 -2 src/sys/kern/kern_lock.c 1.335 +1 -1 src/sys/kern/vfs_subr.c 1.124 +1 -2 src/sys/sys/buf.h 1.30 +3 -2 src/sys/sys/lockmgr.h 1.166 +5 -0 src/sys/sys/vnode.h 1.166 +1 -1 src/sys/ufs/ffs/ffs_vfsops.c 1.8 +2 -2 src/sys/ufs/ifs/ifs_vfsops.c 1.186 +11 -4 src/sys/vm/vm_pageout.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message