From owner-p4-projects@FreeBSD.ORG Fri Mar 27 20:05:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81C00106567A; Fri, 27 Mar 2009 20:05:47 +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 3AB771065673 for ; Fri, 27 Mar 2009 20:05:47 +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 283EA8FC1F for ; Fri, 27 Mar 2009 20:05:47 +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 n2RK5lX1042288 for ; Fri, 27 Mar 2009 20:05:47 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2RK5lgu042286 for perforce@freebsd.org; Fri, 27 Mar 2009 20:05:47 GMT (envelope-from trasz@freebsd.org) Date: Fri, 27 Mar 2009 20:05:47 GMT Message-Id: <200903272005.n2RK5lgu042286@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 159919 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: Fri, 27 Mar 2009 20:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=159919 Change 159919 by trasz@trasz_victim7 on 2009/03/27 20:05:28 Rename unixify_vaccess(). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#26 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#20 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 (text+ko) ==== @@ -3969,7 +3969,7 @@ int error; accmode_t accmode = ap->a_accmode; - if (unixify_vaccess(&accmode, &error)) + if (vfs_unixify_accmode(&accmode, &error)) return (error); /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#11 (text+ko) ==== @@ -71,7 +71,7 @@ if (privused != NULL) *privused = 0; - if (unixify_vaccess(&accmode, &error)) + if (vfs_unixify_accmode(&accmode, &error)) return (error); /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#26 (text+ko) ==== @@ -3548,7 +3548,7 @@ dac_granted = 0; - if (unixify_vaccess(&accmode, &error)) + if (vfs_unixify_accmode(&accmode, &error)) return (error); /* Check the owner. */ @@ -4274,8 +4274,9 @@ } /* - * The purpose of this routine is to remove granularity from vaccess_t, - * reducing it into standard unix access bits. + * The purpose of this routine is to remove granularity from accmode_t, + * reducing it into standard unix access bits - VEXEC, VREAD, VWRITE + * and VADMIN. * * This routine is supposed to be called from the beginning of vaccess * implementations that don't know anything about granularity. If it @@ -4283,7 +4284,7 @@ * puts into variable pointed to by "error". */ int -unixify_vaccess(accmode_t *accmode, int *error) +vfs_unixify_accmode(accmode_t *accmode, int *error) { /* * Unix does not provide any explicit "deny" access rules. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#20 (text+ko) ==== @@ -629,7 +629,7 @@ int vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, accmode_t accmode, struct ucred *cred, int *privused); -int unixify_vaccess(accmode_t *accmode, int *error); +int vfs_unixify_accmode(accmode_t *accmode, int *error); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); void vdrop(struct vnode *);