From owner-cvs-src-old@FreeBSD.ORG  Tue Oct 26 15:48:22 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 B92BC1065675
	for <cvs-src-old@freebsd.org>; Tue, 26 Oct 2010 15:48:22 +0000 (UTC)
	(envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A65C88FC17
	for <cvs-src-old@freebsd.org>; Tue, 26 Oct 2010 15:48:22 +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 o9QFmMpw073231
	for <cvs-src-old@freebsd.org>; Tue, 26 Oct 2010 15:48:22 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9QFmMN8073230
	for cvs-src-old@freebsd.org; Tue, 26 Oct 2010 15:48:22 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201010261548.o9QFmMN8073230@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, 26 Oct 2010 15:48:03 +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
 dmu.c zfs_vnops.c zil.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, 26 Oct 2010 15:48:22 -0000

mm          2010-10-26 15:48:03 UTC

  FreeBSD src repository

  Modified files:
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs dmu.c 
                                                   zfs_vnops.c 
                                                   zil.c 
  Log:
  SVN rev 214378 on 2010-10-26 15:48:03Z by mm
  
  Bugfix merge from OpenSolaris:
  
  OpenSolaris onnv-revision:      10209:91f47f0e7728
  6830541 zfs_get_data_trips on a verify
  6696242 multiple zfs_fillpage() zfs: accessing past end of object panics
  6785914 zfs fails to drop dn_struct_rwlock in recovery code path
  
  Approved by:    delphij (mentor)
  Obtained from:  OpenSolaris (Bug ID 6830541, 6696242, 6785914)
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.12      +5 -5      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  1.84      +19 -1     src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  1.13      +4 -0      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c