[Ocfs2-tools-commits] jlbec commits r320 - trunk/libocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-10-06 21:15:51 -0500 (Wed, 06 Oct 2004)
New Revision: 320

Modified:
   trunk/libocfs2/extent_map.c
Log:

o Some asserts should be CORRUPT_EXTENT_BLOCK errors.



Modified: trunk/libocfs2/extent_map.c
===================================================================
--- trunk/libocfs2/extent_map.c	2004-10-07 01:42:10 UTC (rev 319)
+++ trunk/libocfs2/extent_map.c	2004-10-07 02:15:51 UTC (rev 320)
@@ -130,12 +130,15 @@
 			    ((cpos + clusters) >
 			     (rec->e_cpos + rec->e_clusters)))
 				goto out_free;
+
 			/*
 			 * We don't insert this record because we're
 			 * about to traverse it
 			 */
+
+			ret = OCFS2_ET_CORRUPT_EXTENT_BLOCK;
 			if (blkno)
-				abort();
+				goto out_free;
 			blkno = rec->e_blkno;
 		}
 
@@ -143,8 +146,9 @@
 		 * We don't support holes, and we're still up
 		 * in the branches, so we'd better have found someone
 		 */
+		ret = OCFS2_ET_CORRUPT_EXTENT_BLOCK;
 		if (!blkno)
-			abort();
+			goto out_free;
 
 		ret = ocfs2_read_extent_block(em->em_cinode->ci_fs,
 					      blkno, eb_buf);