diff options
| author | dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
| commit | ddf9ef103e0a611c9a01425a28baf8a612b0d114 (patch) | |
| tree | 19da0d56c468b8e0f6d0361d7d39157f561aa69f /sys/i386/ibcs2 | |
| parent | 07cbccc353d7afbe8948b6025965ca36739d7373 (diff) | |
| download | FreeBSD-src-ddf9ef103e0a611c9a01425a28baf8a612b0d114.zip FreeBSD-src-ddf9ef103e0a611c9a01425a28baf8a612b0d114.tar.gz | |
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.
Diffstat (limited to 'sys/i386/ibcs2')
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_misc.c | 4 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_stat.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index b909140..75796b0 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -323,7 +323,7 @@ ibcs2_getdents(td, uap) fdrop(fp, td); return (EBADF); } - vp = (struct vnode *)fp->f_data; + vp = fp->un_data.vnode; if (vp->v_type != VDIR) { /* XXX vnode readdir op should do this */ fdrop(fp, td); return (EINVAL); @@ -480,7 +480,7 @@ ibcs2_read(td, uap) fdrop(fp, td); return (EBADF); } - vp = (struct vnode *)fp->f_data; + vp = fp->un_data.vnode; if (vp->v_type != VDIR) { fdrop(fp, td); return read(td, (struct read_args *)uap); diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c index 7992535..eb66407 100644 --- a/sys/i386/ibcs2/ibcs2_stat.c +++ b/sys/i386/ibcs2/ibcs2_stat.c @@ -132,7 +132,7 @@ ibcs2_fstatfs(td, uap) if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); - mp = ((struct vnode *)fp->f_data)->v_mount; + mp = fp->un_data.vnode->v_mount; sp = &mp->mnt_stat; error = VFS_STATFS(mp, sp, td); fdrop(fp, td); |
