[Ocfs2-commits] mfasheh commits r1502 - branches/dlm-changes/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-27 19:58:30 -0500 (Mon, 27 Sep 2004)
New Revision: 1502

Modified:
   branches/dlm-changes/src/suballoc.c
Log:
* clean up the debug stuff in suballoc.c



Modified: branches/dlm-changes/src/suballoc.c
===================================================================
--- branches/dlm-changes/src/suballoc.c	2004-09-28 00:48:41 UTC (rev 1501)
+++ branches/dlm-changes/src/suballoc.c	2004-09-28 00:58:30 UTC (rev 1502)
@@ -130,9 +130,6 @@
 	if (status < 0)
 		LOG_ERROR_STATUS(status);
 #warning "we need to zero out the other blocks in the group! (only inode alloc?)"
-	printk("filled new block group:\n");
-	debug_bg(bg);
-
 bail:
 	LOG_EXIT_STATUS(status);
 	return status;
@@ -255,10 +252,7 @@
 		goto bail;
 	}
 
-	debug_suballoc_inode(fe);
-
 	credits = ocfs_calc_group_alloc_credits(osb->sb, cl->cl_cpg);
-	printk("allocate new block group, requires %d credits\n", credits);
 	handle = ocfs_start_trans(osb, handle, credits);
 	if (!handle) {
 		status = -ENOMEM;
@@ -289,8 +283,8 @@
 
 	/* setup the group */
 	bg_blkno = ocfs_clusters_to_blocks(osb->sb, bit_off);
-	printk("new descriptor, record %u, at block %llu\n", 
-	       alloc_rec, bg_blkno);
+	LOG_TRACE_ARGS("new descriptor, record %u, at block %llu\n", 
+		       alloc_rec, bg_blkno);
 
 	bg_bh = sb_getblk(osb->sb, bg_blkno);
 	if (!bg_bh) {
@@ -344,8 +338,6 @@
 	alloc_inode->i_size = fe->i_size;
 	alloc_inode->i_blocks = (alloc_inode->i_size + osb->sb->s_blocksize - 1) >> osb->sb->s_blocksize_bits;
 
-	printk("allocation succes, new block group allocator:\n");
-	debug_suballoc_inode(fe);
 	status = 0;
 bail:
 #ifdef OCFS_BG_ZERO
@@ -588,9 +580,8 @@
 	OCFS_ASSERT(IS_VALID_GROUP_DESC(bg));
 	OCFS_ASSERT(bg->bg_free_bits_count >= num_bits);
 
-	printk("block_group_set_bits: off = %u, num = %u\n", bit_off, 
-	       num_bits);
-	debug_bg(bg);
+	LOG_TRACE_ARGS("block_group_set_bits: off = %u, num = %u\n", bit_off, 
+		       num_bits);
 
 	status = ocfs_journal_access(handle, 
 				     group_bh, 
@@ -755,8 +746,8 @@
 
 	chain = ocfs2_find_victim_chain(cl);
 
-	printk("trying to alloc %u bits from chain %u, inode %llu\n",
-	       bits_wanted, chain, OCFS_I(alloc_inode)->ip_blkno);
+	LOG_TRACE_ARGS("trying to alloc %u bits from chain %u, inode %llu\n",
+		       bits_wanted, chain, OCFS_I(alloc_inode)->ip_blkno);
 
 	status = ocfs_read_bh(osb, 
 			      cl->cl_recs[chain].c_blkno << osb->sb->s_blocksize_bits, 
@@ -867,9 +858,8 @@
 		goto bail;
 	}
 
-	printk("Allocated %u bits from suballocator %llu\n", *num_bits, 
-	       fe->i_blkno);
-	debug_suballoc_inode(fe);
+	LOG_TRACE_ARGS("Allocated %u bits from suballocator %llu\n", 
+		       *num_bits, fe->i_blkno);
 
 	down (&(OCFS_I(alloc_inode)->ip_sem));
 	OCFS_I(alloc_inode)->u.ip_bitinfo.used_bits = fe->id1.bitmap1.i_used;
@@ -992,10 +982,10 @@
 		    <= ((u32) cl->cl_cpg * (u32) cl->cl_bpc));
 
 	bg_blkno = ocfs_which_suballoc_group(start_block, start_bit);
-	printk("freeing %u bits from group %llu, starting at %u "
-	       "(1st block = %llu, suballocator %llu)\n",
-	       count, bg_blkno, start_bit, start_block, 
-	       OCFS_I(alloc_inode)->ip_blkno);
+	LOG_TRACE_ARGS("freeing %u bits from group %llu, starting at %u "
+		       "(1st block = %llu, suballocator %llu)\n",
+		       count, bg_blkno, start_bit, start_block, 
+		       OCFS_I(alloc_inode)->ip_blkno);
 
 	status = ocfs_read_bh(osb, 
 			      bg_blkno << osb->sb->s_blocksize_bits,