diff options
author | jlemon <jlemon@FreeBSD.org> | 2000-11-25 07:16:06 +0000 |
---|---|---|
committer | jlemon <jlemon@FreeBSD.org> | 2000-11-25 07:16:06 +0000 |
commit | f3b673b4a9cc4ac1ca9914931bd4c0051799200a (patch) | |
tree | 84de1f39d8b944ea33d14ed54cf404690bfe8eea | |
parent | 2cc9c3919ea00049168b877ec06ce6d14b9165cb (diff) | |
download | FreeBSD-src-f3b673b4a9cc4ac1ca9914931bd4c0051799200a.zip FreeBSD-src-f3b673b4a9cc4ac1ca9914931bd4c0051799200a.tar.gz |
Update to reflect the disappearance of getsock().
Found by: LINT
-rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 8 | ||||
-rw-r--r-- | sys/miscfs/portal/portal_vfsops.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 950d383..139746d 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -97,12 +97,14 @@ portal_mount(mp, path, data, ndp, p) if (error) return (error); - error = getsock(p->p_fd, args.pa_socket, &fp); + error = holdsock(p->p_fd, args.pa_socket, &fp); if (error) return (error); so = (struct socket *) fp->f_data; - if (so->so_proto->pr_domain->dom_family != AF_UNIX) + if (so->so_proto->pr_domain->dom_family != AF_UNIX) { + fdrop(fp, p); return (ESOCKTNOSUPPORT); + } MALLOC(pn, struct portalnode *, sizeof(struct portalnode), M_TEMP, M_WAITOK); @@ -114,6 +116,7 @@ portal_mount(mp, path, data, ndp, p) if (error) { FREE(fmp, M_PORTALFSMNT); FREE(pn, M_TEMP); + fdrop(fp, p); return (error); } @@ -142,6 +145,7 @@ portal_mount(mp, path, data, ndp, p) #endif (void)portal_statfs(mp, &mp->mnt_stat, p); + fdrop(fp, p); return (0); } diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 950d383..139746d 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -97,12 +97,14 @@ portal_mount(mp, path, data, ndp, p) if (error) return (error); - error = getsock(p->p_fd, args.pa_socket, &fp); + error = holdsock(p->p_fd, args.pa_socket, &fp); if (error) return (error); so = (struct socket *) fp->f_data; - if (so->so_proto->pr_domain->dom_family != AF_UNIX) + if (so->so_proto->pr_domain->dom_family != AF_UNIX) { + fdrop(fp, p); return (ESOCKTNOSUPPORT); + } MALLOC(pn, struct portalnode *, sizeof(struct portalnode), M_TEMP, M_WAITOK); @@ -114,6 +116,7 @@ portal_mount(mp, path, data, ndp, p) if (error) { FREE(fmp, M_PORTALFSMNT); FREE(pn, M_TEMP); + fdrop(fp, p); return (error); } @@ -142,6 +145,7 @@ portal_mount(mp, path, data, ndp, p) #endif (void)portal_statfs(mp, &mp->mnt_stat, p); + fdrop(fp, p); return (0); } |