[PVFS2-CVS] commit by slang in pvfs2/src/io/bmi: bmi.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi
In directory parlweb:/tmp/cvs-serv2348/src/io/bmi

Modified Files:
      Tag: slang-sio-branch
	bmi.c 
Log Message:
fixes to small io stuff to get test-zero-fill working again.  Also committing updates from HEAD to make things easier for merge.


Index: bmi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi.c,v
diff -p -u -r1.65.2.1 -r1.65.2.2
--- bmi.c	4 Nov 2005 07:14:15 -0000	1.65.2.1
+++ bmi.c	11 Nov 2005 22:19:04 -0000	1.65.2.2
@@ -24,6 +24,7 @@
 #include "gen-locks.h"
 #include "str-utils.h"
 #include "id-generator.h"
+#include "pvfs2-internal.h"
 
 /*
  * List of BMI addrs currently managed.
@@ -654,7 +655,7 @@ int BMI_test(bmi_op_id_t id,
     if (ret == 0 && *outcount == 1)
     {
 	gossip_debug(GOSSIP_BMI_DEBUG_CONTROL,
-                     "BMI_test completing: %Lu\n", Lu(id));
+                     "BMI_test completing: %llu\n", llu(id));
 	return (1);
     }
     return (ret);
@@ -977,7 +978,7 @@ int BMI_testcontext(int incount,
 	for(i=0; i<*outcount; i++)
 	{
 	    gossip_debug(GOSSIP_BMI_DEBUG_CONTROL, 
-		"BMI_testcontext completing: %Lu\n", Lu(out_id_array[i]));
+		"BMI_testcontext completing: %llu\n", llu(out_id_array[i]));
 	}
 	return (1);
     }
@@ -1176,7 +1177,7 @@ int BMI_set_info(PVFS_BMI_addr_t addr,
 	    {
 		/* kill the address */
 		gossip_debug(GOSSIP_BMI_DEBUG_CONTROL,
-		    "bmi discarding address: %Lu\n", Lu(addr));
+		    "bmi discarding address: %llu\n", llu(addr));
 		ref_list_rem(cur_ref_list, addr);
 		/* NOTE: this triggers request to module to free underlying
 		 * resources if it wants to
@@ -1624,7 +1625,7 @@ int BMI_cancel(bmi_op_id_t id, 
     int ret = -1;
 
     gossip_debug(GOSSIP_BMI_DEBUG_CONTROL,
-                 "%s: cancel id %Lu\n", __func__, Lu(id));
+                 "%s: cancel id %llu\n", __func__, llu(id));
 
     target_op = id_gen_safe_lookup(id);
     assert(target_op->op_id == id);
@@ -1823,17 +1824,12 @@ case err: bmi_errno = BMI_##err; break
         __CASE(ENOTEMPTY);
         __CASE(ELOOP);
         __CASE(ENOMSG);
-        __CASE(EUNATCH);
-        __CASE(EBADR);
         __CASE(ENODATA);
         __CASE(ETIME);
-        __CASE(ENONET);
         __CASE(EREMOTE);
-        __CASE(ECOMM);
         __CASE(EPROTO);
         __CASE(EBADMSG);
         __CASE(EOVERFLOW);
-        __CASE(ERESTART);
         __CASE(EMSGSIZE);
         __CASE(EPROTOTYPE);
         __CASE(ENOPROTOOPT);