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/fs/unionfs/union_subr.c | |
| 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/fs/unionfs/union_subr.c')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 706977e..5d3d12c 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -1329,7 +1329,7 @@ union_dircheck(struct thread *td, struct vnode **vp, struct file *fp) } VOP_UNLOCK(lvp, 0, td); FILE_LOCK(fp); - fp->f_data = (caddr_t) lvp; + fp->un_data.vnode = lvp; fp->f_offset = 0; FILE_UNLOCK(fp); error = vn_close(*vp, FREAD, fp->f_cred, td); |
