From owner-p4-projects@FreeBSD.ORG Sun Sep 21 18:48:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A537106566C; Sun, 21 Sep 2008 18:48:37 +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 D1733106564A for ; Sun, 21 Sep 2008 18:48:36 +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 C17018FC08 for ; Sun, 21 Sep 2008 18:48:36 +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 m8LImaCA064326 for ; Sun, 21 Sep 2008 18:48:36 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8LImar5064324 for perforce@freebsd.org; Sun, 21 Sep 2008 18:48:36 GMT (envelope-from trasz@freebsd.org) Date: Sun, 21 Sep 2008 18:48:36 GMT Message-Id: <200809211848.m8LImar5064324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 150226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Sep 2008 18:48:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=150226 Change 150226 by trasz@trasz_traszkan on 2008/09/21 18:48:13 Branding is a libc thing. Remove it from 'struct acl', and move into acl_t_struct. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_init.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#26 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#7 (text+ko) ==== @@ -60,7 +60,7 @@ int _acl_brand(const acl_t acl) { - return (acl->ats_acl.acl_brand); + return (acl->ats_brand); } int @@ -98,7 +98,7 @@ { assert(_acl_brand_may_be(acl, brand)); - acl->ats_acl.acl_brand = brand; + acl->ats_brand = brand; } void ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_init.c#6 (text+ko) ==== @@ -65,7 +65,7 @@ bzero(acl, sizeof(struct acl_t_struct)); - acl->ats_acl.acl_brand = ACL_BRAND_UNKNOWN; + acl->ats_brand = ACL_BRAND_UNKNOWN; acl->ats_acl.acl_magic = ACL_MAGIC; acl->ats_acl.acl_length = ACL_MAX_ENTRIES; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#26 (text+ko) ==== @@ -115,15 +115,7 @@ int acl_magic; int acl_cnt; int acl_length; - /* - * acl_brand is for libc internal bookkeeping only. - * Applications should use acl_get_brand_np(3). - * Kernel code should use the "type" argument passed - * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls; - * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e - * ACL, ACL_TYPE_NFS4 means NFS4 ACL. - */ - int acl_brand; + int acl_spare_field; struct acl_entry acl_entry[ACL_MAX_ENTRIES]; }; @@ -133,13 +125,22 @@ struct acl_t_struct { struct acl ats_acl; int ats_cur_entry; + /* + * ats_brand is for libc internal bookkeeping only. + * Applications should use acl_get_brand_np(3). + * Kernel code should use the "type" argument passed + * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls; + * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e + * ACL, ACL_TYPE_NFS4 means NFS4 ACL. + */ + int ats_brand; }; typedef struct acl_t_struct *acl_t; #define ACL_MAGIC 0x5452535a /* - * Possible valid values for acl_brand field. + * Possible valid values for ats_brand field. */ #define ACL_BRAND_UNKNOWN 0 #define ACL_BRAND_POSIX 1