[Ocfs2-commits] jlbec commits r1589 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-10-22 16:53:44 -0500 (Fri, 22 Oct 2004)
New Revision: 1589

Modified:
   trunk/src/aops.c
   trunk/src/proc.c
Log:
o Ok, I'm an idiot

Modified: trunk/src/aops.c
===================================================================
--- trunk/src/aops.c	2004-10-22 21:48:18 UTC (rev 1588)
+++ trunk/src/aops.c	2004-10-22 21:53:44 UTC (rev 1589)
@@ -536,7 +536,9 @@
 
 	/* NOTE: create flag is set when we ?may? have to allocate some
 	   blocks for the file. */
-	if (create && vbo_max > OCFS_I(inode)->ip_alloc_size) {
+	if (create &&
+	    (vbo_max > ocfs2_clusters_to_bytes(osb->sb,
+					       OCFS_I(inode)->ip_clusters))) {
 		/* WARNING: How much do we really want to extend the file? */
 		status = ocfs_extend_file(osb, inode, vbo_max);
 		if (status < 0) {

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-10-22 21:48:18 UTC (rev 1588)
+++ trunk/src/proc.c	2004-10-22 21:53:44 UTC (rev 1589)
@@ -465,7 +465,7 @@
   "Delayed Locks            : %u\n"		\
   "Checkpointing Locks      : %u\n"
 
-	len = sprintf (page, PROC_STATS,
+	len = sprintf (page, PROC_STATS, pubmap,
 		       osb->num_nodes, osb->s_clustersize, 
 		       ocfs2_clusters_to_bytes(osb->sb, osb->cluster_bitmap.validbits),
 		       osb->cluster_bitmap.failed,