From owner-cvs-src-old@FreeBSD.ORG  Tue May 11 07:08:01 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9AAE21065673
	for <cvs-src-old@freebsd.org>; Tue, 11 May 2010 07:08:01 +0000 (UTC)
	(envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 88E6D8FC25
	for <cvs-src-old@freebsd.org>; Tue, 11 May 2010 07:08:01 +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 o4B781PR052859
	for <cvs-src-old@freebsd.org>; Tue, 11 May 2010 07:08:01 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4B781gA052858
	for cvs-src-old@freebsd.org; Tue, 11 May 2010 07:08:01 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201005110708.o4B781gA052858@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	mm@repoman.freebsd.org using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 11 May 2010 07:07:44 +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
	dbuf.c dmu_object.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: Tue, 11 May 2010 07:08:01 -0000

mm          2010-05-11 07:07:44 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs dbuf.c 
                                                   dmu_object.c 
  Log:
  SVN rev 207907 on 2010-05-11 07:07:44Z by mm
  
  MFC r207624:
  
  Fix deadlock during zfs receive.
  
  OpenSolaris onnv revision:      9299:8809e849f63e
  
  PR:             kern/146296
  Approved by:    pjd, delphij (mentor)
  Obtained from:  OpenSolaris (Bug ID 6783818, 6826836)
  
  Revision  Changes    Path
  1.4.2.4   +3 -3      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  1.2.2.4   +15 -13    src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c