From owner-cvs-src-old@FreeBSD.ORG  Sun May 23 21:05:46 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 D545D1065674
	for <cvs-src-old@freebsd.org>; Sun, 23 May 2010 21:05:46 +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 C2DB48FC16
	for <cvs-src-old@freebsd.org>; Sun, 23 May 2010 21:05:46 +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 o4NL5kfe008438
	for <cvs-src-old@freebsd.org>; Sun, 23 May 2010 21:05:46 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4NL5kPv008437
	for cvs-src-old@freebsd.org; Sun, 23 May 2010 21:05:46 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201005232105.o4NL5kPv008437@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: Sun, 23 May 2010 21:02:43 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libzfs/common
 libzfs_mount.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 zfs_ioctl.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: Sun, 23 May 2010 21:05:46 -0000

mm          2010-05-23 21:02:43 UTC

  FreeBSD src repository

  Modified files:
    cddl/contrib/opensolaris/lib/libzfs/common libzfs_mount.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_ioctl.c 
  Log:
  SVN rev 208472 on 2010-05-23 21:02:43Z by mm
  
  Fix zfs receive temporarily changing unchanged stream properties.
  Fix possible panic with zfs_enable_datasets.
  
  OpenSolaris onnv revision:      8536:33bd5de3260e
  
  Approved by:    pjd, delphij (mentor)
  Obtained from:  OpenSolaris (Bug ID 6748561, 6757075)
  MFC after:      3 days
  
  Revision  Changes    Path
  1.5       +6 -4      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  1.24      +8 -5      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c