[Pvfs2-cvs] commit by kunkel in pvfs2/src/io/dev: pint-dev.c pint-dev-shared.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/dev
In directory parlweb1:/tmp/cvs-serv589/src/io/dev

Modified Files:
      Tag: kunkel-hint-branch
	pint-dev.c pint-dev-shared.h 
Log Message:
Sync hint-branch to current CVS version


Index: pint-dev.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/dev/pint-dev.c,v
diff -p -u -r1.30.2.3 -r1.30.2.4
--- pint-dev.c	13 Jan 2007 10:13:31 -0000	1.30.2.3
+++ pint-dev.c	17 Feb 2007 10:39:40 -0000	1.30.2.4
@@ -176,8 +176,8 @@ int PINT_dev_get_mapped_regions(int ndes
         {
             gossip_err(
                 "Error: total size (%llu) of device "
-                "buffer must be < %d MB.\n",
-                llu(total_size), PVFS2_BUFMAP_MAX_TOTAL_SIZE);
+                "buffer must be < %llu MB.\n",
+                llu(total_size), llu(PVFS2_BUFMAP_MAX_TOTAL_SIZE));
             break;
         }
         if (params[i].dev_buffer_size & (params[i].dev_buffer_size - 1))

Index: pint-dev-shared.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/dev/pint-dev-shared.h,v
diff -p -u -r1.17.2.2 -r1.17.2.3
--- pint-dev-shared.h	13 Jan 2007 10:13:31 -0000	1.17.2.2
+++ pint-dev-shared.h	17 Feb 2007 10:39:40 -0000	1.17.2.3
@@ -48,7 +48,7 @@
 (PVFS2_BUFMAP_DEFAULT_DESC_COUNT * PVFS2_BUFMAP_DEFAULT_DESC_SIZE)
 
 /* Sane maximum values for these parameters (128 MB) */
-#define PVFS2_BUFMAP_MAX_TOTAL_SIZE      (128 * (1024 * 1024))
+#define PVFS2_BUFMAP_MAX_TOTAL_SIZE      (128ULL * (1024 * 1024))
 
 /* log to base 2 when we know that number is a power of 2 */
 static inline int LOG2(int number)