diff options
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 13 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 87b25cc9086b..2225220cfe1d 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -395,7 +395,7 @@ fdesc_setattr(ap) } return (error); } - vp = fp->un_data.vnode; + vp = fp->f_data; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) { fdrop(fp, ap->a_td); return (error); diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 558238aaa39f..64fee388c93c 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -352,7 +352,7 @@ fifo_ioctl(ap) if (ap->a_command == FIONBIO) return (0); if (ap->a_fflag & FREAD) { - filetmp.un_data.socket = ap->a_vp->v_fifoinfo->fi_readsock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock; filetmp.f_cred = ap->a_cred; error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td->td_ucred, ap->a_td); @@ -360,7 +360,7 @@ fifo_ioctl(ap) return (error); } if (ap->a_fflag & FWRITE) { - filetmp.un_data.socket = ap->a_vp->v_fifoinfo->fi_writesock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock; filetmp.f_cred = ap->a_cred; error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td->td_ucred, ap->a_td); @@ -482,9 +482,9 @@ fifo_poll(ap) events |= POLLINIGNEOF; } - filetmp.un_data.socket = ap->a_vp->v_fifoinfo->fi_readsock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock; filetmp.f_cred = ap->a_cred; - if (filetmp.un_data.socket) + if (filetmp.f_data) revents |= soo_poll(&filetmp, events, ap->a_td->td_ucred, ap->a_td); @@ -497,11 +497,12 @@ fifo_poll(ap) } events = ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND); if (events) { - filetmp.un_data.socket = ap->a_vp->v_fifoinfo->fi_writesock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock; filetmp.f_cred = ap->a_cred; - if (filetmp.un_data.socket) + if (filetmp.f_data) { revents |= soo_poll(&filetmp, events, ap->a_td->td_ucred, ap->a_td); + } } return (revents); } diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index d4cb1a621c5c..66e516d4ff0b 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -106,7 +106,7 @@ portal_mount(mp, path, data, ndp, td) fdrop(fp, td); return(ENOTSOCK); } - so = fp->un_data.socket; /* XXX race against userland */ + so = fp->f_data; /* XXX race against userland */ if (so->so_proto->pr_domain->dom_family != AF_UNIX) { fdrop(fp, td); return (ESOCKTNOSUPPORT); @@ -186,7 +186,7 @@ portal_unmount(mp, mntflags, td) * daemon to wake up, and then the accept will get ECONNABORTED * which it interprets as a request to go and bury itself. */ - soshutdown(VFSTOPORTAL(mp)->pm_server->un_data.socket, 2); + soshutdown(VFSTOPORTAL(mp)->pm_server->f_data, 2); /* * Discard reference to underlying file. Must call closef because * this may be the last reference. diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index 18c77a651d9f..0d8c06d3a0f1 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -269,7 +269,7 @@ portal_open(ap) /* * Kick off connection */ - error = portal_connect(so, fmp->pm_server->un_data.socket); + error = portal_connect(so, fmp->pm_server->f_data); if (error) goto bad; diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 5d3d12c77396..e08b70a1ee96 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->un_data.vnode = lvp; + fp->f_data = lvp; fp->f_offset = 0; FILE_UNLOCK(fp); error = vn_close(*vp, FREAD, fp->f_cred, td); |