[Ocfs2-tools-commits] zab commits r402 - trunk/libocfs2

[svn-commits at oss.oracle.com]

Author: zab
Date: 2004-11-16 12:45:00 -0600 (Tue, 16 Nov 2004)
New Revision: 402

Modified:
   trunk/libocfs2/bitmap.c
   trunk/libocfs2/chainalloc.c
Log:
o return the node we go left from, not left to
o the first cluster bitmap group desc is magical


Modified: trunk/libocfs2/bitmap.c
===================================================================
--- trunk/libocfs2/bitmap.c	2004-11-16 01:37:28 UTC (rev 401)
+++ trunk/libocfs2/bitmap.c	2004-11-16 18:45:00 UTC (rev 402)
@@ -398,8 +398,8 @@
 		br = rb_entry(parent, struct ocfs2_bitmap_region, br_node);
 
 		if (bitno + total_bits <= br->br_start_bit) {
+			last_left = parent;
 			p = &(*p)->rb_left;
-			last_left = *p;
 			br = NULL;
 		} else if (bitno >= (br->br_start_bit + br->br_total_bits)) {
 			p = &(*p)->rb_right;

Modified: trunk/libocfs2/chainalloc.c
===================================================================
--- trunk/libocfs2/chainalloc.c	2004-11-16 01:37:28 UTC (rev 401)
+++ trunk/libocfs2/chainalloc.c	2004-11-16 18:45:00 UTC (rev 402)
@@ -98,6 +98,9 @@
 	if (cr->cr_ag->bg_size != ocfs2_group_bitmap_size(fs->fs_blocksize))
 		goto out_free_cr;
 
+	if (gd_blkno == OCFS2_RAW_SB(fs->fs_super)->s_first_cluster_group)
+		gd_blkno = 0;
+
 	cb->cb_errcode = ocfs2_bitmap_alloc_region(bitmap,
 						   gd_blkno,
 						   cr->cr_ag->bg_bits,