diff options
author | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
commit | ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 (patch) | |
tree | ee3c8690226ac4a086122b794c975aab9319b671 /sys/compat | |
parent | fe540b81bb4ea3115544cd0f082b4ecd39cebb62 (diff) | |
download | FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.zip FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.tar.gz |
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.
Diffstat (limited to 'sys/compat')
-rw-r--r-- | sys/compat/linux/linux_file.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_stats.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_fcntl.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_filio.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_ioctl.c | 4 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_misc.c | 6 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_socket.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_stream.c | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 1058d49..2b37dcd 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -270,7 +270,7 @@ getdents_common(struct thread *td, struct linux_getdents64_args *args, return (EBADF); } - vp = fp->un_data.vnode; + vp = fp->f_data; if (vp->v_type != VDIR) { fdrop(fp, td); return (EINVAL); diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 712d914..d02186f 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -289,7 +289,7 @@ linux_fstatfs(struct thread *td, struct linux_fstatfs_args *args) error = getvnode(td->td_proc->p_fd, args->fd, &fp); if (error) return error; - mp = fp->un_data.vnode->v_mount; + mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) { diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index d41192b..8632b3c 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -311,7 +311,7 @@ fd_truncate(td, fd, flp) if ((error = fget(td, fd, &fp)) != 0) return (error); - vp = fp->un_data.vnode; + vp = fp->f_data; if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) { fdrop(fp, td); diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index dbbdfdb..ca1b8db 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -115,7 +115,7 @@ svr4_sys_read(td, uap) } if (fp->f_type == DTYPE_SOCKET) { - so = fp->un_data.socket; + so = fp->f_data; DPRINTF(("fd %d is a socket\n", uap->fd)); if (so->so_state & SS_ASYNC) { DPRINTF(("fd %d is an ASYNC socket!\n", uap->fd)); diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index 51334bc..08ba009 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -112,7 +112,7 @@ svr4_sys_ioctl(td, uap) #if defined(DEBUG_SVR4) if (fp->f_type == DTYPE_SOCKET) { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; DPRINTF(("<<< IN: so_state = 0x%x\n", so->so_state)); } #endif @@ -157,7 +157,7 @@ svr4_sys_ioctl(td, uap) if (fp->f_type == DTYPE_SOCKET) { struct socket *so; - so = fp->un_data.socket; + so = fp->f_data; DPRINTF((">>> OUT: so_state = 0x%x\n", so->so_state)); } #endif diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 9f9d7e5..16f7863 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -271,7 +271,7 @@ svr4_sys_getdents64(td, uap) return (EBADF); } - vp = fp->un_data.vnode; + vp = fp->f_data; if (vp->v_type != VDIR) { fdrop(fp, td); @@ -451,7 +451,7 @@ svr4_sys_getdents(td, uap) return (EBADF); } - vp = fp->un_data.vnode; + vp = fp->f_data; if (vp->v_type != VDIR) { fdrop(fp, td); return (EINVAL); @@ -627,7 +627,7 @@ svr4_sys_fchroot(td, uap) return error; if ((error = getvnode(fdp, uap->fd, &fp)) != 0) return error; - vp = fp->un_data.vnode; + vp = fp->f_data; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (vp->v_type != VDIR) error = ENOTDIR; diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index a2c49b4..b5da396 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -82,7 +82,7 @@ svr4_find_socket(td, fp, dev, ino) ino_t ino; { struct svr4_sockcache_entry *e; - void *cookie = fp->un_data.socket->so_emuldata; + void *cookie = ((struct socket *)fp->f_data)->so_emuldata; if (svr4_str_initialized != 2) { if (atomic_cmpset_acq_int(&svr4_str_initialized, 0, 1)) { diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index ae885ed..9a5c465 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -644,7 +644,7 @@ getparm(fp, pa) if (st == NULL) return; - so = fp->un_data.socket; + so = fp->f_data; pa->family = st->s_family; |