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.
                 */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to