From owner-cvs-src-old@FreeBSD.ORG  Thu Apr 15 16:41:02 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
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 8BDD61065775
	for <cvs-src-old@freebsd.org>; Thu, 15 Apr 2010 16:41:02 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 777EC8FC1C
	for <cvs-src-old@freebsd.org>; Thu, 15 Apr 2010 16:41:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3FGf25n052078
	for <cvs-src-old@freebsd.org>; Thu, 15 Apr 2010 16:41:02 GMT
	(envelope-from pjd@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3FGf2wF052077
	for cvs-src-old@freebsd.org; Thu, 15 Apr 2010 16:41:02 GMT
	(envelope-from pjd@repoman.freebsd.org)
Message-Id: <201004151641.o3FGf2wF052077@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	pjd@repoman.freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 15 Apr 2010 16:40:54 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
	zfs_vfsops.c zfs_vnops.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
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Apr 2010 16:41:02 -0000

pjd         2010-04-15 16:40:54 UTC

  FreeBSD src repository

  Modified files:
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_vfsops.c 
                                                   zfs_vnops.c 
  Log:
  SVN rev 206667 on 2010-04-15 16:40:54Z by pjd
  
  Fix 3-way deadlock that can happen because of ZFS and vnode lock
  order reversal.
  
  thread0 (vfs_fhtovp)    thread1 (vop_getattr)   thread2 (zfs_recv)
  --------------------    ---------------------   ------------------
                          vn_lock
  rrw_enter_read
                                                  rrw_enter_write (hangs)
                          rrw_enter_read (hangs)
  vn_lock (hangs)
  
  Submitted by:   Attila Nagy <bra@fsn.hu>
  MFC after:      3 days
  
  Revision  Changes    Path
  1.36      +7 -4      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  1.61      +3 -3      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c