From owner-p4-projects@FreeBSD.ORG  Sun May 24 19:38:04 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E3F9106567C; Sun, 24 May 2009 19:38:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 093EA106567A
	for <perforce@freebsd.org>; Sun, 24 May 2009 19:38:04 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EAFA08FC1F
	for <perforce@freebsd.org>; Sun, 24 May 2009 19:38:03 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OJc3rE090148
	for <perforce@freebsd.org>; Sun, 24 May 2009 19:38:03 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OJc3if090146
	for perforce@freebsd.org; Sun, 24 May 2009 19:38:03 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 24 May 2009 19:38:03 GMT
Message-Id: <200905241938.n4OJc3if090146@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 162666 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2009 19:38:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=162666

Change 162666 by trasz@trasz_victim on 2009/05/24 19:37:12

	Move ACL wrappers from contrib/ to compat/.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 add
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#1 add
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#6 (text+ko) ====

@@ -16,6 +16,7 @@
 SRCS+=	u8_textprep.c
 
 .PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
+SRCS+=	opensolaris_acl.c
 SRCS+=	opensolaris_kmem.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
@@ -66,7 +67,6 @@
 ZFS_SRCS=	${ZFS_OBJS:C/.o$/.c/}
 SRCS+=	${ZFS_SRCS}
 SRCS+=	vdev_geom.c
-SRCS+=	acl_compat.c
 
 # Use UMA for ZIO allocation. This is not stable.
 #CFLAGS+=-DZIO_USE_UMA