From ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 Mon Sep 17 00:00:00 2001 From: dillon Date: Mon, 13 Jan 2003 00:33:17 +0000 Subject: Bow to the whining masses and change a union back into void *. Retain removal of unnecessary casts and throw in some minor cleanups to see if anyone complains, just for the hell of it. --- sys/kern/kern_acl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'sys/kern/kern_acl.c') diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c index 1611614..6b9f942 100644 --- a/sys/kern/kern_acl.c +++ b/sys/kern/kern_acl.c @@ -780,8 +780,7 @@ __acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap) mtx_lock(&Giant); error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); if (error == 0) { - error = vacl_get_acl(td, fp->un_data.vnode, - uap->type, uap->aclp); + error = vacl_get_acl(td, fp->f_data, uap->type, uap->aclp); fdrop(fp, td); } mtx_unlock(&Giant); @@ -802,8 +801,7 @@ __acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap) mtx_lock(&Giant); error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); if (error == 0) { - error = vacl_set_acl(td, fp->un_data.vnode, - uap->type, uap->aclp); + error = vacl_set_acl(td, fp->f_data, uap->type, uap->aclp); fdrop(fp, td); } mtx_unlock(&Giant); @@ -868,7 +866,7 @@ __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap) mtx_lock(&Giant); error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); if (error == 0) { - error = vacl_delete(td, fp->un_data.vnode, uap->type); + error = vacl_delete(td, fp->f_data, uap->type); fdrop(fp, td); } mtx_unlock(&Giant); @@ -933,8 +931,7 @@ __acl_aclcheck_fd(struct thread *td, struct __acl_aclcheck_fd_args *uap) mtx_lock(&Giant); error = getvnode(td->td_proc->p_fd, uap->filedes, &fp); if (error == 0) { - error = vacl_aclcheck(td, fp->un_data.vnode, - uap->type, uap->aclp); + error = vacl_aclcheck(td, fp->f_data, uap->type, uap->aclp); fdrop(fp, td); } mtx_unlock(&Giant); -- cgit v1.1