Change struct file f_data to un_data, a union of the correct struct

pointer types, and remove a huge number of casts from code using it.

Change struct xfile xf_data to xun_data (ABI is still compatible).

If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary.  There are no operational changes in this
commit.

1 files changed, 4 insertions, 5 deletions

diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index 3b48a82..1611614 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -780,7 +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, (struct vnode *)fp->f_data,
+		error = vacl_get_acl(td, fp->un_data.vnode,
 			    uap->type, uap->aclp);
 		fdrop(fp, td);
 	}
@@ -802,7 +802,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, (struct vnode *)fp->f_data,
+		error = vacl_set_acl(td, fp->un_data.vnode,
 			    uap->type, uap->aclp);
 		fdrop(fp, td);
 	}
@@ -868,8 +868,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, (struct vnode *)fp->f_data, 
-			    uap->type);
+		error = vacl_delete(td, fp->un_data.vnode, uap->type);
 		fdrop(fp, td);
 	}
 	mtx_unlock(&Giant);
@@ -934,7 +933,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, (struct vnode *)fp->f_data,
+		error = vacl_aclcheck(td, fp->un_data.vnode,
 			    uap->type, uap->aclp);
 		fdrop(fp, td);
 	}