d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When we can't reconnect a socket, don't forget to unlock before retrying

Browse Source 
or we can deadlock.

Obtained from:  NetBSD
This commit is contained in:
Peter Wemm 1998-05-31 18:02:56 +00:00
parent 6bea90a1ee
commit 4a5f4c547e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=36515
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/nfs/nfs_socket.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
* $Id: nfs_socket.c,v 1.34 1998/05/31 17:57:43 peter Exp $
* $Id: nfs_socket.c,v 1.35 1998/05/31 18:00:46 peter Exp $
*/
/*
@ -640,6 +640,9 @@ nfs_receive(rep, aname, mp)
error = nfs_reconnect(rep);
if (!error)
goto tryagain;
else
nfs_sndunlock(&rep->r_nmp->nm_flag,
&rep->r_nmp->nm_state);
}
} else {
if ((so = rep->r_nmp->nm_so) == NULL)

5
sys/nfsclient/nfs_socket.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
* $Id: nfs_socket.c,v 1.34 1998/05/31 17:57:43 peter Exp $
* $Id: nfs_socket.c,v 1.35 1998/05/31 18:00:46 peter Exp $
*/
/*
@ -640,6 +640,9 @@ nfs_receive(rep, aname, mp)
error = nfs_reconnect(rep);
if (!error)
goto tryagain;
else
nfs_sndunlock(&rep->r_nmp->nm_flag,
&rep->r_nmp->nm_state);
}
} else {
if ((so = rep->r_nmp->nm_so) == NULL)

5
sys/nfsserver/nfs_srvsock.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95
* $Id: nfs_socket.c,v 1.34 1998/05/31 17:57:43 peter Exp $
* $Id: nfs_socket.c,v 1.35 1998/05/31 18:00:46 peter Exp $
*/
/*
@ -640,6 +640,9 @@ nfs_receive(rep, aname, mp)
error = nfs_reconnect(rep);
if (!error)
goto tryagain;
else
nfs_sndunlock(&rep->r_nmp->nm_flag,
&rep->r_nmp->nm_state);
}
} else {
if ((so = rep->r_nmp->nm_so) == NULL)