d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Reduce z_teardown_lock lock scope a bit.

Browse Source 
- The error variable is int, not bool.
- Convert spaces to tabs where needed.

Approved by:	re (kib)
This commit is contained in:
Pawel Jakub Dawidek 2009-08-17 09:28:15 +00:00
parent 0330a5dc10
commit e35eb914f4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -4529,9 +4529,9 @@ vop_getextattr {
vp = nd.ni_vp; vp = nd.ni_vp;
NDFREE(&nd, NDF_ONLY_PNBUF); NDFREE(&nd, NDF_ONLY_PNBUF);
if (error != 0) { if (error != 0) {
ZFS_EXIT(zfsvfs);
if (error == ENOENT) if (error == ENOENT)
error = ENOATTR; error = ENOATTR;
ZFS_EXIT(zfsvfs);
return (error); return (error);
} }
@ -4597,9 +4597,9 @@ vop_deleteextattr {
vp = nd.ni_vp; vp = nd.ni_vp;
NDFREE(&nd, NDF_ONLY_PNBUF); NDFREE(&nd, NDF_ONLY_PNBUF);
if (error != 0) { if (error != 0) {
ZFS_EXIT(zfsvfs);
if (error == ENOENT) if (error == ENOENT)
error = ENOATTR; error = ENOATTR;
ZFS_EXIT(zfsvfs);
return (error); return (error);
} }
error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd);
@ -4712,7 +4712,7 @@ vop_listextattr {
error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace,
ap->a_cred, ap->a_td, VREAD); ap->a_cred, ap->a_td, VREAD);
if (error) if (error != 0)
return (error); return (error);
error = zfs_create_attrname(ap->a_attrnamespace, "", attrprefix, error = zfs_create_attrname(ap->a_attrnamespace, "", attrprefix,
@ -4729,13 +4729,13 @@ vop_listextattr {
error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td, error = zfs_lookup(ap->a_vp, NULL, &xvp, NULL, 0, ap->a_cred, td,
LOOKUP_XATTR); LOOKUP_XATTR);
if (error != 0) { if (error != 0) {
ZFS_EXIT(zfsvfs);
/* /*
* ENOATTR means that the EA directory does not yet exist, * ENOATTR means that the EA directory does not yet exist,
* i.e. there are no extended attributes there. * i.e. there are no extended attributes there.
*/ */
if (error == ENOATTR) if (error == ENOATTR)
error = 0; error = 0;
ZFS_EXIT(zfsvfs);
return (error); return (error);
} }
@ -4825,10 +4825,10 @@ zfs_freebsd_getacl(ap)
return (error); return (error);
error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt);
if (vsecattr.vsa_aclentp != NULL) if (vsecattr.vsa_aclentp != NULL)
kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz);
return (error); return (error);
} }
int int