diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-03-31 01:41:30 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-03-31 01:41:30 +0000 |
| commit | 8eeaad5c11363d7ab9da222fdb14854d875980fa (patch) | |
| tree | a2166426af7223990afbf9b50fb2719c9e2a1447 /sys/fs | |
| parent | bc542b543dceb077637763284c40ef7de01cc60a (diff) | |
| download | FreeBSD-src-8eeaad5c11363d7ab9da222fdb14854d875980fa.zip FreeBSD-src-8eeaad5c11363d7ab9da222fdb14854d875980fa.tar.gz | |
Export uipc_connect2() from uipc_usrreq.c instead of unp_connect2(),
and consume that interface in portalfs and fifofs instead. In the
new world order, unp_connect2() assumes that the unpcb mutex is
held, whereas uipc_connect2() validates that the passed sockets are
UNIX domain sockets, then grabs the mutex.
NB: the portalfs and fifofs code gets down and dirty with UNIX domain
sockets. Maybe this is a bad thing.
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index e7112d0..c9d0fa2 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -201,7 +201,7 @@ fifo_open(ap) if (error) goto fail2; fip->fi_writesock = wso; - error = unp_connect2(wso, rso); + error = uipc_connect2(wso, rso); if (error) { (void)soclose(wso); fail2: diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index a8c31c8..b43936d 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -203,7 +203,7 @@ portal_connect(so, so2) M_NOWAIT); so2 = so3; - return (unp_connect2(so, so2)); + return (uipc_connect2(so, so2)); } static int |
