Date: Sat, 30 May 2009 19:46:06 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163114 for review Message-ID: <200905301946.n4UJk6Zs007273@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163114 Change 163114 by trasz@trasz_victim on 2009/05/30 19:45:24 Replace VOP_ACCESS(9) with VOP_ACCESSX(9) where appropriate. Completely untested. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#19 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#34 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#18 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#19 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#17 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#29 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#19 (text+ko) ==== @@ -267,7 +267,7 @@ if (error != 0) goto out; #endif - error = VOP_ACCESS(vp, VREAD_ACL, td->td_ucred, td); + error = VOP_ACCESSX(vp, VREAD_ACL, td->td_ucred, td); if (error != 0) goto out; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#34 (text+ko) ==== @@ -3652,9 +3652,9 @@ case EXTATTR_NAMESPACE_USER: #ifdef SunOS_doesnt_do_that if (accmode == VREAD) - return (VOP_ACCESS(vp, VREAD_NAMED_ATTRS, cred, td)); + return (VOP_ACCESSX(vp, VREAD_NAMED_ATTRS, cred, td)); if (accmode == VWRITE) - return (VOP_ACCESS(vp, VWRITE_NAMED_ATTRS, cred, td)); + return (VOP_ACCESSX(vp, VWRITE_NAMED_ATTRS, cred, td)); #endif /* XXX: Is this possible for "accmode" to not be any of the two above? */ return (VOP_ACCESS(vp, accmode, cred, td)); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#18 (text+ko) ==== @@ -697,7 +697,7 @@ if (error) return (error); #endif - error = VOP_ACCESS(vp, VREAD_ATTRIBUTES, active_cred, td); + error = VOP_ACCESSX(vp, VREAD_ATTRIBUTES, active_cred, td); if (error) return (error); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#19 (text+ko) ==== @@ -377,7 +377,7 @@ /* * Must hold VWRITE_ACL or have appropriate privilege. */ - if ((error = VOP_ACCESS(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) + if ((error = VOP_ACCESSX(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) return (error); if (acl_nfs4_is_trivial(ap->a_aclp, ip->i_uid)) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#17 (text+ko) ==== @@ -100,15 +100,15 @@ if (error) return (error); - error = VOP_ACCESS(tdp, VDELETE, cred, td); + error = VOP_ACCESSX(tdp, VDELETE, cred, td); if (error == 0) return (0); - error = VOP_ACCESS(vdp, VDELETE_CHILD, cred, td); + error = VOP_ACCESSX(vdp, VDELETE_CHILD, cred, td); if (error == 0) return (0); - error = VOP_ACCESS(vdp, VEXPLICIT_DENY | VDELETE_CHILD, cred, td); + error = VOP_ACCESSX(vdp, VEXPLICIT_DENY | VDELETE_CHILD, cred, td); if (error) return (error); @@ -469,7 +469,7 @@ * XXX: Fix the comment above. */ if (flags & WILLBEDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) @@ -604,7 +604,7 @@ */ if (nameiop == RENAME && (flags & ISLASTCN)) { if (flags & WILLBEDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) @@ -637,7 +637,7 @@ * of EACCESS. */ if (tdp->v_type == VDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#29 (text+ko) ==== @@ -89,7 +89,7 @@ #include <ufs/ffs/ffs_extern.h> -static vop_access_t ufs_access; +static vop_accessx_t ufs_accessx; static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); static vop_close_t ufs_close; @@ -298,8 +298,8 @@ } static int -ufs_access(ap) - struct vop_access_args /* { +ufs_accessx(ap) + struct vop_accessx_args /* { struct vnode *a_vp; accmode_t a_accmode; struct ucred *a_cred; @@ -403,7 +403,7 @@ break; default: printf( -"ufs_access(): Error retrieving ACL on object (%d).\n", +"ufs_accessx(): Error retrieving ACL on object (%d).\n", error); /* * XXX: Fall back until debugged. Should @@ -633,11 +633,11 @@ * * XXX: Calling it four times seems a little excessive. */ - error = VOP_ACCESS(vp, VWRITE_ATTRIBUTES, cred, td); + error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td); if (error) error = VOP_ACCESS(vp, VWRITE, cred, td); } else - error = VOP_ACCESS(vp, VWRITE_ATTRIBUTES, cred, td); + error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td); if (error) return (error); if (vap->va_atime.tv_sec != VNOVAL) @@ -743,7 +743,7 @@ * To modify the permissions on a file, must possess VADMIN * for that file. */ - if ((error = VOP_ACCESS(vp, VWRITE_ACL, cred, td))) + if ((error = VOP_ACCESSX(vp, VWRITE_ACL, cred, td))) return (error); /* * Privileged processes may set the sticky bit on non-directories, @@ -810,7 +810,7 @@ * To modify the ownership of a file, must possess VADMIN for that * file. */ - if ((error = VOP_ACCESS(vp, VWRITE_OWNER, cred, td))) + if ((error = VOP_ACCESSX(vp, VWRITE_OWNER, cred, td))) return (error); /* * To change the owner of a file, or change the group of a file to a @@ -2593,7 +2593,7 @@ .vop_read = VOP_PANIC, .vop_reallocblks = VOP_PANIC, .vop_write = VOP_PANIC, - .vop_access = ufs_access, + .vop_accessx = ufs_accessx, .vop_bmap = ufs_bmap, .vop_cachedlookup = ufs_lookup, .vop_close = ufs_close, @@ -2637,7 +2637,7 @@ struct vop_vector ufs_fifoops = { .vop_default = &fifo_specops, .vop_fsync = VOP_PANIC, - .vop_access = ufs_access, + .vop_accessx = ufs_accessx, .vop_close = ufsfifo_close, .vop_getattr = ufs_getattr, .vop_inactive = ufs_inactive,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905301946.n4UJk6Zs007273>