diff options
author | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
---|---|---|
committer | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
commit | cd72f2180bfff020d03180e6eba1c3a0e0125468 (patch) | |
tree | 19da0d56c468b8e0f6d0361d7d39157f561aa69f /sys/fs/portalfs | |
parent | 1bd6f83d4d49a87f27dbfe50f9717a182e9f1f47 (diff) | |
download | src-cd72f2180bfff020d03180e6eba1c3a0e0125468.tar.gz src-cd72f2180bfff020d03180e6eba1c3a0e0125468.zip |
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.
Notes
Notes:
svn path=/head/; revision=109123
Diffstat (limited to 'sys/fs/portalfs')
-rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 22c8d99237bf..d4cb1a621c5c 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 = (struct socket *) fp->f_data; /* XXX race against userland */ + so = fp->un_data.socket; /* 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((struct socket *) VFSTOPORTAL(mp)->pm_server->f_data, 2); + soshutdown(VFSTOPORTAL(mp)->pm_server->un_data.socket, 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 3241ff9dda47..18c77a651d9f 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, (struct socket *)fmp->pm_server->f_data); + error = portal_connect(so, fmp->pm_server->un_data.socket); if (error) goto bad; |