summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_acl.c
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2009-11-04 07:04:15 +0000
committertrasz <trasz@FreeBSD.org>2009-11-04 07:04:15 +0000
commita335996751811a0404c9a19690bbf7ddd14bc54f (patch)
treece086ac27353d8153cc1e30dc5dbc34fd621223d /sys/kern/vfs_acl.c
parent7ff2a9de0b40a6dcc6e4b480c011e71b4a91e043 (diff)
downloadFreeBSD-src-a335996751811a0404c9a19690bbf7ddd14bc54f.zip
FreeBSD-src-a335996751811a0404c9a19690bbf7ddd14bc54f.tar.gz
Style fixes.
Diffstat (limited to 'sys/kern/vfs_acl.c')
-rw-r--r--sys/kern/vfs_acl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index 2dd64f4..df4ee51 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -213,7 +213,7 @@ vacl_set_acl(struct thread *td, struct vnode *vp, acl_type_t type,
inkernelacl = acl_alloc(M_WAITOK);
error = acl_copyin(aclp, inkernelacl, type);
- if (error)
+ if (error != 0)
goto out;
error = vn_start_write(vp, &mp, V_WAIT | PCATCH);
if (error != 0)
@@ -233,7 +233,7 @@ out_unlock:
vn_finished_write(mp);
out:
acl_free(inkernelacl);
- return(error);
+ return (error);
}
/*
@@ -276,12 +276,12 @@ vacl_delete(struct thread *td, struct vnode *vp, acl_type_t type)
int error;
error = vn_start_write(vp, &mp, V_WAIT | PCATCH);
- if (error)
+ if (error != 0)
return (error);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
#ifdef MAC
error = mac_vnode_check_deleteacl(td->td_ucred, vp, type);
- if (error)
+ if (error != 0)
goto out;
#endif
error = VOP_SETACL(vp, acl_type_unold(type), 0, td->td_ucred, td);
@@ -305,7 +305,7 @@ vacl_aclcheck(struct thread *td, struct vnode *vp, acl_type_t type,
inkernelacl = acl_alloc(M_WAITOK);
error = acl_copyin(aclp, inkernelacl, type);
- if (error)
+ if (error != 0)
goto out;
error = VOP_ACLCHECK(vp, type, inkernelacl, td->td_ucred, td);
out:
@@ -501,7 +501,7 @@ __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap)
int
__acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
{
- struct nameidata nd;
+ struct nameidata nd;
int vfslocked, error;
NDINIT(&nd, LOOKUP, MPSAFE|FOLLOW, UIO_USERSPACE, uap->path, td);
@@ -521,7 +521,7 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
int
__acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap)
{
- struct nameidata nd;
+ struct nameidat nd;
int vfslocked, error;
NDINIT(&nd, LOOKUP, MPSAFE|NOFOLLOW, UIO_USERSPACE, uap->path, td);
OpenPOWER on IntegriCloud