Date: Wed, 4 Nov 2009 07:04:15 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r198875 - head/sys/kern Message-ID: <200911040704.nA474FDo022330@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Wed Nov 4 07:04:15 2009 New Revision: 198875 URL: http://svn.freebsd.org/changeset/base/198875 Log: Style fixes. Modified: head/sys/kern/vfs_acl.c Modified: head/sys/kern/vfs_acl.c ============================================================================== --- head/sys/kern/vfs_acl.c Wed Nov 4 06:48:34 2009 (r198874) +++ head/sys/kern/vfs_acl.c Wed Nov 4 07:04:15 2009 (r198875) @@ -213,7 +213,7 @@ vacl_set_acl(struct thread *td, struct v 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 vn 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 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, struc 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, s 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911040704.nA474FDo022330>