[Pvfs2-cvs] commit by slang in pvfs2/src/io/bmi/bmi_tcp: bmi-tcp.c sockio.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp
In directory parlweb1:/tmp/cvs-serv12750/src/io/bmi/bmi_tcp

Modified Files:
	bmi-tcp.c sockio.c 
Log Message:
merge nb recv EAGAIN fix


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.125 -r1.126
--- bmi-tcp.c	30 Nov 2007 19:33:17 -0000	1.125
+++ bmi-tcp.c	7 Dec 2007 23:05:11 -0000	1.126
@@ -3004,7 +3004,7 @@ static int tcp_do_work_recv(bmi_method_a
     if (ret < TCP_ENC_HDR_SIZE)
     {
 	tmp_errno = errno;
-	gossip_err("Error: BMI_sockio_brecv: %s\n", strerror(tmp_errno));
+	gossip_err("Error: BMI_sockio_nbrecv: %s\n", strerror(tmp_errno));
 	tcp_forget_addr(map, 0, bmi_tcp_errno_to_pvfs(-tmp_errno));
 	return (0);
     }

Index: sockio.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/sockio.c,v
diff -p -u -r1.26 -r1.27
--- sockio.c	16 Oct 2007 22:13:48 -0000	1.26
+++ sockio.c	7 Dec 2007 23:05:11 -0000	1.27
@@ -199,7 +199,7 @@ int BMI_sockio_nbrecv(int s,
 	{
 	    return (len - comp);	/* return amount completed */
 	}
-	if (ret == -1 && errno == EINTR)
+	if (ret == -1 && (errno == EINTR || errno == EAGAIN))
 	{
 	    goto nbrecv_restart;
 	}