PERFORCE change 146256 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Wed Jul 30 19:07:56 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=146256
Change 146256 by trasz at trasz_traszkan on 2008/07/30 19:07:29
Style fixes, as suggested by pjd at .
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);
}
More information about the p4-projects
mailing list