From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 13:08:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF9651065677; Tue, 26 Aug 2008 13:08:51 +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 833BA1065670
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 13:08:51 +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 4795A8FC08
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 13:08:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QD8pi3050443
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 13:08:51 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QD8p0K050441
	for perforce@freebsd.org; Tue, 26 Aug 2008 13:08:51 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 26 Aug 2008 13:08:51 GMT
Message-Id: <200808261308.m7QD8p0K050441@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 148516 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: Tue, 26 Aug 2008 13:08:52 -0000

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

Change 148516 by trasz@trasz_traszkan on 2008/08/26 13:08:49

	Compilation fix.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 (text+ko) ====

@@ -40,7 +40,6 @@
 static acl_t
 _nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask)
 {
-	int error;
 	acl_t newacl;
 	mode_t mode;
 
@@ -53,11 +52,7 @@
 	_acl_brand_as(newacl, ACL_BRAND_NFS4);
 
 	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	error = acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
-	if (error) {
-		errno = EINVAL;
-		return (NULL);
-	}
+	acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
 
 	return (newacl);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 (text+ko) ====

@@ -989,6 +989,7 @@
 	return (1);
 }
 
+#ifdef _KERNEL
 /*
  * This routine is used to determine whether to remove extended attribute
  * that stores ACL contents.
@@ -1021,6 +1022,7 @@
 
 	return (trivial);
 }
+#endif
 
 int
 acl_nfs4_check(const struct acl *aclp, int is_directory)