diff options
author | alfred <alfred@FreeBSD.org> | 2002-12-13 22:41:47 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-12-13 22:41:47 +0000 |
commit | 4f48184fb2c8948c406b21c3f802b5b281cef957 (patch) | |
tree | a1ef524330ea7e253fb665abea3ddb594cde69fc /sys/kern/subr_acl_posix1e.c | |
parent | d19b4e039d47537b44233aae83d03b974d29d771 (diff) | |
download | FreeBSD-src-4f48184fb2c8948c406b21c3f802b5b281cef957.zip FreeBSD-src-4f48184fb2c8948c406b21c3f802b5b281cef957.tar.gz |
Backout removal SCARGS, the code freeze is only "selectively" over.
Diffstat (limited to 'sys/kern/subr_acl_posix1e.c')
-rw-r--r-- | sys/kern/subr_acl_posix1e.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c index b194454..2a182cd 100644 --- a/sys/kern/subr_acl_posix1e.c +++ b/sys/kern/subr_acl_posix1e.c @@ -689,11 +689,11 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap) int error; mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), td); error = namei(&nd); if (error == 0) { - error = vacl_get_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_get_acl(td, nd.ni_vp, SCARG(uap, type), + SCARG(uap, aclp)); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -712,11 +712,11 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap) int error; mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), td); error = namei(&nd); if (error == 0) { - error = vacl_set_acl(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_set_acl(td, nd.ni_vp, SCARG(uap, type), + SCARG(uap, aclp)); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -735,10 +735,10 @@ __acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap) int error; mtx_lock(&Giant); - error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); + error = getvnode(td->td_proc->p_fd, SCARG(uap, filedes), &fp); if (error == 0) { error = vacl_get_acl(td, (struct vnode *)fp->f_data, - uap->type, uap->aclp); + SCARG(uap, type), SCARG(uap, aclp)); fdrop(fp, td); } mtx_unlock(&Giant); @@ -757,10 +757,10 @@ __acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap) int error; mtx_lock(&Giant); - error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); + error = getvnode(td->td_proc->p_fd, SCARG(uap, filedes), &fp); if (error == 0) { error = vacl_set_acl(td, (struct vnode *)fp->f_data, - uap->type, uap->aclp); + SCARG(uap, type), SCARG(uap, aclp)); fdrop(fp, td); } mtx_unlock(&Giant); @@ -779,10 +779,10 @@ __acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap) int error; mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), td); error = namei(&nd); if (error == 0) { - error = vacl_delete(td, nd.ni_vp, uap->type); + error = vacl_delete(td, nd.ni_vp, SCARG(uap, type)); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -801,10 +801,10 @@ __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap) int error; mtx_lock(&Giant); - error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); + error = getvnode(td->td_proc->p_fd, SCARG(uap, filedes), &fp); if (error == 0) { error = vacl_delete(td, (struct vnode *)fp->f_data, - uap->type); + SCARG(uap, type)); fdrop(fp, td); } mtx_unlock(&Giant); @@ -823,11 +823,11 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap) int error; mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), td); error = namei(&nd); if (error == 0) { - error = vacl_aclcheck(td, nd.ni_vp, uap->type, - uap->aclp); + error = vacl_aclcheck(td, nd.ni_vp, SCARG(uap, type), + SCARG(uap, aclp)); NDFREE(&nd, 0); } mtx_unlock(&Giant); @@ -846,10 +846,10 @@ __acl_aclcheck_fd(struct thread *td, struct __acl_aclcheck_fd_args *uap) int error; mtx_lock(&Giant); - error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); + error = getvnode(td->td_proc->p_fd, SCARG(uap, filedes), &fp); if (error == 0) { error = vacl_aclcheck(td, (struct vnode *)fp->f_data, - uap->type, uap->aclp); + SCARG(uap, type), SCARG(uap, aclp)); fdrop(fp, td); } mtx_unlock(&Giant); |