diff options
| author | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | e6fa9b9e922913444c2e6b2b58bf3de5eaed868d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/nfsclient/nfs_socket.c | |
| parent | 1ea6cbb8c29088e04528460633798a6c131ca1ba (diff) | |
| download | FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.zip FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.tar.gz | |
Back out my lats commit of locking down a socket, it conflicts with hsu's work.
Requested by: hsu
Diffstat (limited to 'sys/nfsclient/nfs_socket.c')
| -rw-r--r-- | sys/nfsclient/nfs_socket.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 09ea0e0..be0063c 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -230,21 +230,18 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep) * that interruptible mounts don't hang here for a long time. */ s = splnet(); - SOCK_LOCK(so); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { - (void) msleep((caddr_t)&so->so_timeo, SOCK_MTX(so), + (void) tsleep((caddr_t)&so->so_timeo, PSOCK, "nfscon", 2 * hz); if ((so->so_state & SS_ISCONNECTING) && so->so_error == 0 && rep && (error = nfs_sigintr(nmp, rep, (rep->r_td ? rep->r_td->td_proc : NULL))) != 0){ so->so_state &= ~SS_ISCONNECTING; - SOCK_UNLOCK(so); splx(s); goto bad; } } - SOCK_UNLOCK(so); if (so->so_error) { error = so->so_error; so->so_error = 0; @@ -417,14 +414,10 @@ nfs_send(struct socket *so, struct sockaddr *nam, struct mbuf *top, rep->r_flags &= ~R_MUSTRESEND; soflags = rep->r_nmp->nm_soflags; - 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 @@ -653,14 +646,10 @@ errout: } else { if ((so = rep->r_nmp->nm_so) == NULL) return (EACCES); - SOCK_LOCK(so); - if (so->so_state & SS_ISCONNECTED) { - SOCK_UNLOCK(so); + if (so->so_state & SS_ISCONNECTED) getnam = (struct sockaddr **)0; - } else { - SOCK_UNLOCK(so); + else getnam = aname; - } auio.uio_resid = len = 1000000; auio.uio_td = td; do { |
