From owner-cvs-src-old@FreeBSD.ORG  Thu May 13 20:56:09 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 B1DD61065778
	for <cvs-src-old@freebsd.org>; Thu, 13 May 2010 20:56:09 +0000 (UTC)
	(envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8222A8FC17
	for <cvs-src-old@freebsd.org>; Thu, 13 May 2010 20:56:09 +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 o4DKu9SQ073939
	for <cvs-src-old@freebsd.org>; Thu, 13 May 2010 20:56:09 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DKu9vk073938
	for cvs-src-old@freebsd.org; Thu, 13 May 2010 20:56:09 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201005132056.o4DKu9vk073938@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: Thu, 13 May 2010 20:55:58 +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
 dbuf.c dmu_traverse.c dsl_dataset.c dsl_scrub.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: Thu, 13 May 2010 20:56:09 -0000

mm          2010-05-13 20:55:58 UTC

  FreeBSD src repository

  Modified files:
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs dbuf.c 
                                                   dmu_traverse.c 
                                                   dsl_dataset.c 
                                                   dsl_scrub.c 
                                                   zil.c 
  Log:
  SVN rev 208050 on 2010-05-13 20:55:58Z by mm
  
  Fix ZIL-related panic on zfs rollback.
  
  OpenSolaris onnv-revision: 8746:e1d96ca6808c
  
  Approved by:    pjd, delphij (mentor)
  Obtained from:  OpenSolaris (Bug ID 6796377)
  MCF after:      1 week
  
  Revision  Changes    Path
  1.9       +15 -15    src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  1.5       +1 -5      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  1.11      +16 -9     src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  1.3       +11 -0     src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  1.10      +1 -32     src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c