From owner-p4-projects@FreeBSD.ORG Wed Jul 30 19:07:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5AB71065678; Wed, 30 Jul 2008 19:07:55 +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 A97361065674 for ; Wed, 30 Jul 2008 19:07:55 +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 9CD528FC20 for ; Wed, 30 Jul 2008 19:07:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6UJ7tYZ009555 for ; Wed, 30 Jul 2008 19:07:55 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6UJ7tGK009553 for perforce@freebsd.org; Wed, 30 Jul 2008 19:07:55 GMT (envelope-from trasz@freebsd.org) Date: Wed, 30 Jul 2008 19:07:55 GMT Message-Id: <200807301907.m6UJ7tGK009553@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 146256 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: Wed, 30 Jul 2008 19:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=146256 Change 146256 by trasz@trasz_traszkan on 2008/07/30 19:07:29 Style fixes, as suggested by pjd@. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 (text+ko) ==== @@ -3555,7 +3555,7 @@ /* Mostly taken from common/syscall/acl.c. */ vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; - if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, CRED())) + if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred)) return (error); aclbsize = vsecattr.vsa_aclcnt * sizeof (ace_t); @@ -3566,16 +3566,16 @@ } error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); - if (error) + if (error != 0) goto errout; - if (vsecattr.vsa_aclcnt) + if (vsecattr.vsa_aclcnt != NULL) kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); return (0); errout: - if (aclbsize && vsecattr.vsa_aclentp) + if (aclbsize != NULL && vsecattr.vsa_aclentp != NULL) kmem_free(vsecattr.vsa_aclentp, aclbsize); return (error); } @@ -3601,39 +3601,30 @@ /* Mostly taken from common/syscall/acl.c. */ error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td); - if (error) + if (error != 0) return (error); if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) return (EINVAL); vsecattr.vsa_mask = VSA_ACE; - aclbsize = ap->a_aclp->acl_cnt * sizeof (ace_t); + aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); aaclp = vsecattr.vsa_aclentp; vsecattr.vsa_aclentsz = aclbsize; - error = aces_from_acl(vsecattr.vsa_aclentp, &(vsecattr.vsa_aclcnt), ap->a_aclp); - if (error) { + error = aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); + if (error != 0) { kmem_free(aaclp, aclbsize); return (EINVAL); } -#if 0 - (void) VOP_RWLOCK(ap->a_vp, V_WRITELOCK_TRUE, NULL); -#endif - if (error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, CRED())) { + if (error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred)) { kmem_free(aaclp, aclbsize); -#if 0 - VOP_RWUNLOCK(ap->a_vp, V_WRITELOCK_TRUE, NULL); -#endif return (error); } + kmem_free(aaclp, aclbsize); -#if 0 - VOP_RWUNLOCK(ap->a_vp, V_WRITELOCK_TRUE, NULL); -#endif - return (0); }