[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/bmi/bmi_tcp: .cvsignore bmi-tcp.c socket-collection-epoll.c

[CVS commit program]

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

Modified Files:
      Tag: cu-security-branch
	bmi-tcp.c socket-collection-epoll.c 
Added Files:
      Tag: cu-security-branch
	.cvsignore 
Log Message:
revert cu-security-branch to before the attempted merge with Orange-Branch



Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.127.4.2 -r1.127.4.3
--- bmi-tcp.c	2 Sep 2009 20:16:07 -0000	1.127.4.2
+++ bmi-tcp.c	21 May 2010 17:34:12 -0000	1.127.4.3
@@ -3648,17 +3648,9 @@ static int tcp_accept_init(int *socket, 
 	    (errno == EHOSTDOWN) ||
 	    (errno == ENONET) ||
             (errno == EHOSTUNREACH) ||
-	    (errno == EOPNOTSUPP) ||
-            (errno == ENETUNREACH) ||
-            (errno == ENFILE) ||
-            (errno == EMFILE))
+	    (errno == EOPNOTSUPP) || (errno == ENETUNREACH))
 	{
 	    /* try again later */
-            if ((errno == ENFILE) || (errno == EMFILE))
-            {
-	        gossip_err("Error: accept: %s (continuing)\n",strerror(errno));
-                bmi_method_addr_drop_callback(BMI_tcp_method_name);
-            }
 	    return (0);
 	}
 	else

Index: socket-collection-epoll.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/socket-collection-epoll.c,v
diff -p -u -r1.6.8.2 -r1.6.8.3
--- socket-collection-epoll.c	2 Sep 2009 20:16:07 -0000	1.6.8.2
+++ socket-collection-epoll.c	21 May 2010 17:34:12 -0000	1.6.8.3
@@ -128,11 +128,6 @@ int BMI_socket_collection_testglobal(soc
     memset(maps, 0, (sizeof(bmi_method_addr_p) * incount));
     memset(status, 0, (sizeof(int) * incount));
 
-    if(incount == 0)
-    {
-        return(0);
-    }
-
     /* actually do the epoll_wait() here */
     do
     {