diff options
author | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
---|---|---|
committer | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
commit | 48e3128b34dad9618402f1f4095f7655e779843c (patch) | |
tree | ee3c8690226ac4a086122b794c975aab9319b671 /sys/fs/portalfs | |
parent | a15700fe32805ba16b50232a70037238a04fbb86 (diff) | |
download | src-48e3128b34dad9618402f1f4095f7655e779843c.tar.gz src-48e3128b34dad9618402f1f4095f7655e779843c.zip |
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.
Notes
Notes:
svn path=/head/; revision=109153
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 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; |