[Ocfs2-tools-commits] mfasheh commits r283 - branches/dlm-changes/libocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-29 15:18:46 -0500 (Wed, 29 Sep 2004)
New Revision: 283

Modified:
   branches/dlm-changes/libocfs2/extents.c
Log:
* fix a pair of bugs in extent_iterate_eb



Modified: branches/dlm-changes/libocfs2/extents.c
===================================================================
--- branches/dlm-changes/libocfs2/extents.c	2004-09-29 19:57:29 UTC (rev 282)
+++ branches/dlm-changes/libocfs2/extents.c	2004-09-29 20:18:46 UTC (rev 283)
@@ -207,8 +207,8 @@
 
 	flags = extent_iterate_el(el, eb_rec->e_blkno, ctxt);
 	changed |= flags;
-	if (flags & OCFS2_EXTENT_ABORT)
-		iret |= OCFS2_EXTENT_ABORT;
+	if (flags & (OCFS2_EXTENT_ABORT | OCFS2_EXTENT_ERROR))
+		iret |= flags & (OCFS2_EXTENT_ABORT | OCFS2_EXTENT_ERROR);
 
 	if (changed & OCFS2_EXTENT_CHANGED) {
 		/* Do something */
@@ -216,7 +216,7 @@
 
 	if ((ctxt->flags & OCFS2_EXTENT_FLAG_DEPTH_TRAVERSE) &&
 	    !(ctxt->flags & OCFS2_EXTENT_FLAG_DATA_ONLY) &&
-	    !(iret & OCFS2_EXTENT_ABORT))
+	    !(iret & (OCFS2_EXTENT_ABORT|OCFS2_EXTENT_ERROR)))
 		iret = (*ctxt->func)(ctxt->fs, eb_rec,
 				     ref_tree_depth,
 				     ctxt->ccount, ref_blkno,