[Ocfs2-commits] khackel commits r1095 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-06-14 15:43:53 -0500 (Mon, 14 Jun 2004)
New Revision: 1095

Modified:
   branches/format-changes/src/file.c
   branches/format-changes/src/sysfile.c
Log:
small changes to system file handling
trying to get system files to extend properly (without infinitely looping ;-)



Modified: branches/format-changes/src/file.c
===================================================================
--- branches/format-changes/src/file.c	2004-06-14 16:09:16 UTC (rev 1094)
+++ branches/format-changes/src/file.c	2004-06-14 20:43:53 UTC (rev 1095)
@@ -1205,7 +1205,7 @@
 		}
 
 		status = ocfs_find_space(osb, alloc_size, &bitmapOffset,
-					 &numClustersAlloc, 0, handle);
+					 &numClustersAlloc, system_file, handle);
 		if (status < 0) {
 			OCFS_BH_PUT_DATA(bh);
 			if (status != -ENOSPC && status != -EINTR)

Modified: branches/format-changes/src/sysfile.c
===================================================================
--- branches/format-changes/src/sysfile.c	2004-06-14 16:09:16 UTC (rev 1094)
+++ branches/format-changes/src/sysfile.c	2004-06-14 20:43:53 UTC (rev 1095)
@@ -155,10 +155,12 @@
 						      &contig_blocks, inode);
 		if (status == 0) {
 			// found all remaining
-			OCFS_ASSERT(blocks == contig_blocks);
+			if (blocks <= contig_blocks) {
+				LOG_ERROR_ARGS("blocks (%u) <= contig_blocks (%u)\n",
+					       blocks, contig_blocks);
+			}
 		} else if (status == -EFAIL && contig_blocks > 0) {
 			// found some
-			OCFS_ASSERT(contig_blocks < blocks);
 		} else {
 			// failed
 			LOG_ERROR_STATUS(status = -EIO);