From owner-cvs-src-old@FreeBSD.ORG Fri Aug 20 20:59:13 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FEFD10656B4 for ; Fri, 20 Aug 2010 20:59:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 514B18FC21 for ; Fri, 20 Aug 2010 20:59:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o7KKxDY0083527 for ; Fri, 20 Aug 2010 20:59:13 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o7KKxD2x083526 for cvs-src-old@freebsd.org; Fri, 20 Aug 2010 20:59:13 GMT (envelope-from jhb@repoman.freebsd.org) Message-Id: <201008202059.o7KKxD2x083526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to jhb@repoman.freebsd.org using -f From: John Baldwin Date: Fri, 20 Aug 2010 20:58:57 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 Subject: cvs commit: src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_znode.c src/sys/fs/cd9660 cd9660_vfsops.c src/sys/fs/udf udf_vfsops.c src/sys/kern kern_lock.c src/sys/sys lockmgr.h vnode.h src/sys/ufs/ffs ffs_softdep.c ffs_vfsops.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2010 20:59:13 -0000 jhb 2010-08-20 20:58:57 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_znode.c sys/fs/cd9660 cd9660_vfsops.c sys/fs/udf udf_vfsops.c sys/kern kern_lock.c sys/sys lockmgr.h vnode.h sys/ufs/ffs ffs_softdep.c ffs_vfsops.c Log: SVN rev 211533 on 2010-08-20 20:58:57Z by jhb Revert 210173 as it did not properly fix the bug. It assumed that the VI_LOCK() for a given vnode was used as the internal interlock for that vnode's v_lock lockmgr lock. This is not the case. Instead, add dedicated routines to toggle the LK_NOSHARE and LK_CANRECURSE flags. These routines lock the lockmgr lock's internal interlock to synchronize the updates to the flags member with other threads attempting to acquire the lock. The VN_LOCK_A*() macros now invoke these routines, and the softupdates code uses these routines to temporarly enable recursion on buffer locks. Reviewed by: kib Revision Changes Path 1.15.2.11 +1 -4 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c 1.150.2.7 +0 -2 src/sys/fs/cd9660/cd9660_vfsops.c 1.48.2.10 +1 -4 src/sys/fs/udf/udf_vfsops.c 1.110.2.2 +34 -0 src/sys/kern/kern_lock.c 1.53.2.2 +3 -0 src/sys/sys/lockmgr.h 1.326.2.14 +2 -2 src/sys/sys/vnode.h 1.211.2.11 +3 -9 src/sys/ufs/ffs/ffs_softdep.c 1.329.2.23 +0 -2 src/sys/ufs/ffs/ffs_vfsops.c