From e6fa9b9e922913444c2e6b2b58bf3de5eaed868d Mon Sep 17 00:00:00 2001 From: tanimura Date: Fri, 31 May 2002 11:52:35 +0000 Subject: Back out my lats commit of locking down a socket, it conflicts with hsu's work. Requested by: hsu --- sys/nfsserver/nfs_srvsock.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sys/nfsserver') diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 29c50a0..7091c82 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -714,14 +714,10 @@ nfsrv_send(struct socket *so, struct sockaddr *nam, struct mbuf *top) int error, soflags, flags; soflags = so->so_proto->pr_flags; - SOCK_LOCK(so); - if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) { - SOCK_UNLOCK(so); + if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) sendnam = (struct sockaddr *)0; - } else { - SOCK_UNLOCK(so); + else sendnam = nam; - } if (so->so_type == SOCK_SEQPACKET) flags = MSG_EOR; else -- cgit v1.1