From owner-p4-projects@FreeBSD.ORG Mon May 25 15:02:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4BB7106567B; Mon, 25 May 2009 15:02:52 +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 6FCF0106564A for ; Mon, 25 May 2009 15:02:52 +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 436598FC16 for ; Mon, 25 May 2009 15:02:52 +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 n4PF2qQR071166 for ; Mon, 25 May 2009 15:02:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PF2qbK071164 for perforce@freebsd.org; Mon, 25 May 2009 15:02:52 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 15:02:52 GMT Message-Id: <200905251502.n4PF2qbK071164@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 162722 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, 25 May 2009 15:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162722 Change 162722 by trasz@trasz_victim on 2009/05/25 15:02:38 Simplify the ZFS ACL support. Submitted by: pjd Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 (text+ko) ==== @@ -4801,36 +4801,18 @@ { int error; vsecattr_t vsecattr; - int aclbsize; /* size of acl list in bytes */ if (ap->a_type != ACL_TYPE_NFS4) return (EOPNOTSUPP); - /* Mostly taken from common/syscall/acl.c. */ - vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) return (error); - aclbsize = vsecattr.vsa_aclcnt * sizeof (ace_t); - if (vsecattr.vsa_aclcnt > ACL_MAX_ENTRIES) { - printf("GETACL: no space\n"); - error = ENOSPC; - goto errout; - } - error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); - if (error != 0) - goto errout; - - if (vsecattr.vsa_aclcnt != 0) - kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); - - return (0); + if (vsecattr.vsa_aclentp != NULL) + kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); -errout: - if (aclbsize != 0 && vsecattr.vsa_aclentp != NULL) - kmem_free(vsecattr.vsa_aclentp, aclbsize); return (error); } @@ -4861,7 +4843,7 @@ * entries at the end. Don't allow for setting an ACL that would * cause chmod(2) to run out of ACL entries. */ - if (inkernelacl->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) return (ENOSPC); vsecattr.vsa_mask = VSA_ACE; @@ -4871,13 +4853,10 @@ vsecattr.vsa_aclentsz = aclbsize; aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); - if (error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) { - kmem_free(aaclp, aclbsize); - return (error); - } + error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL); + kmem_free(aaclp, aclbsize); - kmem_free(aaclp, aclbsize); - return (0); + return (error); } int @@ -4890,10 +4869,6 @@ struct thread *td; } */ *ap; { - if (ap->a_type != ACL_TYPE_NFS4) - return (EOPNOTSUPP); - - printf("ACLCHECK\n"); return (EOPNOTSUPP); }