From owner-p4-projects@FreeBSD.ORG Mon Mar 30 15:12:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FA381065676; Mon, 30 Mar 2009 15:12:12 +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 C23331065672 for ; Mon, 30 Mar 2009 15:12:11 +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 A47258FC1A for ; Mon, 30 Mar 2009 15:12:11 +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 n2UFCBCV005269 for ; Mon, 30 Mar 2009 15:12:11 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2UFCBvT005267 for perforce@freebsd.org; Mon, 30 Mar 2009 15:12:11 GMT (envelope-from trasz@freebsd.org) Date: Mon, 30 Mar 2009 15:12:11 GMT Message-Id: <200903301512.n2UFCBvT005267@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 160011 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: Mon, 30 Mar 2009 15:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=160011 Change 160011 by trasz@trasz_victim7 on 2009/03/30 15:11:35 Simplify vfs_unixify_accmode() usage. Completely untested. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#28 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#24 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 (text+ko) ==== @@ -3969,7 +3969,8 @@ int error; accmode_t accmode = ap->a_accmode; - if (vfs_unixify_accmode(&accmode, &error)) + error = vfs_unixify_accmode(&accmode); + if (error != 0) return (error); /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#12 (text+ko) ==== @@ -71,7 +71,8 @@ if (privused != NULL) *privused = 0; - if (vfs_unixify_accmode(&accmode, &error)) + error = vfs_unixify_accmode(&accmode); + if (error != 0) return (error); /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#28 (text+ko) ==== @@ -3548,7 +3548,8 @@ dac_granted = 0; - if (vfs_unixify_accmode(&accmode, &error)) + error = vfs_unixify_accmode(&accmode); + if (error != 0) return (error); /* Check the owner. */ @@ -4278,26 +4279,28 @@ * reducing it into standard unix access bits - VEXEC, VREAD, VWRITE * and VADMIN. * - * This routine is supposed to be called from the beginning of vaccess + * This routine is supposed to be called at the beginning of vaccess * implementations that don't know anything about granularity. If it - * returns 1, then the caller is supposed to return whatever this routine - * puts into variable pointed to by "error". + * returns 0, then the caller is supposed to continue with the usual + * access checks using 'accmode' as modified by this routine. If it + * returns nonzero value, the caller is supposed to return that value + * as errno. + * + * Note that after this routine runs, accmode may be zero. */ int -vfs_unixify_accmode(accmode_t *accmode, int *error) +vfs_unixify_accmode(accmode_t *accmode) { /* * Unix does not provide any explicit "deny" access rules. */ if (*accmode & VEXPLICIT_DENY) { - *error = 0; - return (1); + *accmode = 0; + return (0); } - if (*accmode & (VDELETE_CHILD | VDELETE)) { - *error = EPERM; - return (1); - } + if (*accmode & (VDELETE_CHILD | VDELETE)) + return (EPERM); if (*accmode & VADMIN_PERMS) { *accmode &= ~VADMIN_PERMS; @@ -4306,11 +4309,5 @@ *accmode &= ~(VSTAT_PERMS | VSYNCHRONIZE); - if (*accmode == 0) { - *error = 0; - return (1); - } - return (0); } - ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#24 (text+ko) ==== @@ -625,7 +625,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 vfs_unixify_accmode(accmode_t *accmode, int *error); +int vfs_unixify_accmode(accmode_t *accmode); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); void vdrop(struct vnode *);