Date: Mon, 1 Nov 2010 11:38:04 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r214624 - stable/8/lib/libc/posix1e Message-ID: <201011011138.oA1Bc4rR061101@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011011138.oA1Bc4rR061101>