From owner-cvs-src-old@FreeBSD.ORG  Mon Jan 11 02:37:41 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 A34F91065697
	for <cvs-src-old@freebsd.org>; Mon, 11 Jan 2010 02:37:41 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 503D18FC19
	for <cvs-src-old@freebsd.org>; Mon, 11 Jan 2010 02:37:41 +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 o0B2bfcZ073566
	for <cvs-src-old@freebsd.org>; Mon, 11 Jan 2010 02:37:41 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0B2bfd7073565
	for cvs-src-old@freebsd.org; Mon, 11 Jan 2010 02:37:41 GMT
	(envelope-from delphij@repoman.freebsd.org)
Message-Id: <201001110237.o0B2bfd7073565@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	delphij@repoman.freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 11 Jan 2010 02:31:00 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/cddl/contrib/opensolaris/cmd/zpool zpool_main.c
 src/sys/cddl/boot/zfs
 zfsimpl.h src/sys/cddl/contrib/opensolaris/common/zfs zfs_prop.c
 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_acl.c zfs_ioctl.c
 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys zfs_acl.h
 src/sys/cddl/contrib/opensolaris/uts/common/sys/fs ...
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: Mon, 11 Jan 2010 02:37:41 -0000

delphij     2010-01-11 02:31:00 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    cddl/contrib/opensolaris/cmd/zpool zpool_main.c 
    sys/cddl/boot/zfs    zfsimpl.h 
    sys/cddl/contrib/opensolaris/common/zfs zfs_prop.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs zfs_acl.c 
                                                   zfs_ioctl.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys zfs_acl.h 
    sys/cddl/contrib/opensolaris/uts/common/sys/fs zfs.h 
  Log:
  SVN rev 202059 on 2010-01-11 02:31:00Z by delphij
  
  MFC r201143:
  
  Apply OpenSolaris revision 8021:b8fe9660eb2d which brings our zpool
  to version 14, making it possible for zpools created on OpenSolaris
  2009.06 be used on FreeBSD.
  
  PR:             kern/141800
  Submitted by:   mm
  Reviewed by:    pjd, trasz
  Obtained from:  OpenSolaris onnv-gate
  
  Revision  Changes    Path
  1.4.2.1   +2 -0      src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  1.4.4.2   +4 -2      src/sys/cddl/boot/zfs/zfsimpl.h
  1.4.2.1   +2 -1      src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  1.4.2.1   +1 -2      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  1.9.2.2   +102 -90   src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  1.12.2.4  +8 -0      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  1.5.2.1   +4 -2      src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h