From owner-svn-src-stable@FreeBSD.ORG  Mon Nov  1 11:38:04 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 783ED1065670;
	Mon,  1 Nov 2010 11:38:04 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65B598FC0C;
	Mon,  1 Nov 2010 11:38:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA1Bc4XU061103;
	Mon, 1 Nov 2010 11:38:04 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA1Bc4rR061101;
	Mon, 1 Nov 2010 11:38:04 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201011011138.oA1Bc4rR061101@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 1 Nov 2010 11:38:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214624 - stable/8/lib/libc/posix1e
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Nov 2010 11:38:04 -0000

Author: trasz
Date: Mon Nov  1 11:38:04 2010
New Revision: 214624
URL: http://svn.freebsd.org/changeset/base/214624

Log:
  MFC r212376:
  
  Add minor optimization.  It's less strict than its kernel counterpart
  due to upcoming ACL changes required by the new ZFS.
  
  MFC r212379:
  
  Fix previous commit.

Modified:
  stable/8/lib/libc/posix1e/acl_strip.c
Directory Properties:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/locale/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)
  stable/8/lib/libc/sys/   (props changed)

Modified: stable/8/lib/libc/posix1e/acl_strip.c
==============================================================================
--- stable/8/lib/libc/posix1e/acl_strip.c	Mon Nov  1 10:42:14 2010	(r214623)
+++ stable/8/lib/libc/posix1e/acl_strip.c	Mon Nov  1 11:38:04 2010	(r214624)
@@ -176,6 +176,15 @@ acl_is_trivial_np(const acl_t aclp, int 
 
 	case ACL_BRAND_NFS4:
 		/*
+		 * If the ACL has more than canonical six entries,
+		 * it's non trivial by definition.
+		 */
+		if (aclp->ats_acl.acl_cnt > 6) {
+			*trivialp = 0;
+			return (0);
+		}
+			
+		/*
 		 * Calculate trivial ACL - using acl_strip_np - and compare
 		 * with the original.
 		 */