From owner-p4-projects@FreeBSD.ORG Tue Mar 31 18:58:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 410781065672; Tue, 31 Mar 2009 18:58:01 +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 DCEF0106566B for ; Tue, 31 Mar 2009 18:58:00 +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 C6FAB8FC17 for ; Tue, 31 Mar 2009 18:58:00 +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 n2VIw0ZH050366 for ; Tue, 31 Mar 2009 18:58:00 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VIw0lg050364 for perforce@freebsd.org; Tue, 31 Mar 2009 18:58:00 GMT (envelope-from trasz@freebsd.org) Date: Tue, 31 Mar 2009 18:58:00 GMT Message-Id: <200903311858.n2VIw0lg050364@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 160067 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: Tue, 31 Mar 2009 18:58:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=160067 Change 160067 by trasz@trasz_victim7 on 2009/03/31 18:57:14 Reduce ugliness by removing re#definitions. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 (text+ko) ==== @@ -424,6 +424,8 @@ #endif } +#if !defined(_KERNEL) + acl_t * acl_alloc(enum acl_type type) { @@ -1725,3 +1727,4 @@ return (error); #endif } +#endif /* _KERNEL */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 (text+ko) ==== @@ -46,6 +46,7 @@ extern int ace_trivial_common(void *, int, uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *, uint32_t *mask)); +#if !defined(_KERNEL) extern acl_t *acl_alloc(acl_type_t); extern void acl_free(acl_t *aclp); extern int acl_translate(acl_t *aclp, int target_flavor, @@ -53,6 +54,7 @@ void ksort(caddr_t v, int n, int s, int (*f)()); int cmp2acls(void *a, void *b); +#endif /* _KERNEL */ #ifdef __cplusplus } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#6 (text+ko) ==== @@ -25,23 +25,12 @@ * */ -#define acl_t _zfs_acl_t -#define acl_type_t _zfs_acl_type_t - -/* XXX: Somewhere in these includes must be bzero(9). */ #include #include -#include -#include -#include -#include -#include -#include /* XXX: Most of these isn't needed either. */ #include #include -#include #include #include #include @@ -78,9 +67,6 @@ #include #include -#undef acl_t -#undef acl_type_t - /* * Pull FreeBSD sys/acl.h, not the ZFS one. */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 (text+ko) ==== @@ -25,9 +25,6 @@ /* Portions Copyright 2007 Jeremy Teo */ -#define acl_t _zfs_acl_t -#define acl_type_t _zfs_acl_type_t - #include #include #include @@ -70,9 +67,6 @@ #include #include -#undef acl_t -#undef acl_type_t - /* * Pull FreeBSD sys/acl.h, not the ZFS one. */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 (text+ko) ==== @@ -31,6 +31,14 @@ #include #include +/* + * When compiling OpenSolaris code, this file is getting included instead + * of FreeBSD one. Pull the original sys/acl.h as well. + */ +#undef _SYS_ACL_H +#include "../../../../../../sys/acl.h" +#define _SYS_ACL_H + #ifdef __cplusplus extern "C" { #endif @@ -49,7 +57,9 @@ uint16_t a_type; /* allow or deny */ } ace_t; +#if !defined(_KERNEL) typedef struct acl_info acl_t; +#endif /* * The following are Defined types for an aclent_t. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ==== @@ -44,10 +44,10 @@ typedef enum acl_type { ACLENT_T = 0, ACE_T = 1 -} acl_type_t; +} zfs_acl_type_t; struct acl_info { - acl_type_t acl_type; /* style of acl */ + zfs_acl_type_t acl_type; /* style of acl */ int acl_cnt; /* number of acl entries */ int acl_entry_size; /* sizeof acl entry */ int acl_flags; /* special flags about acl */