From f98d4f8c78aa45516e48d1f3e20421967791d71f Mon Sep 17 00:00:00 2001
From: Joel Becker <joel.becker@oracle.com>
Date: Thu, 12 Jun 2008 22:35:39 -0700
Subject: [PATCH] --- yaml --- r: 102335 b: refs/heads/master c:
 e407e39783a7206d20b3e9961aedf272de966e31 h: refs/heads/master i:   102333:
 3aecd839abf6417830cda9d3836bb0aa930f64ca   102331:
 21afb6f1efe3bdf1cd87ef1548a8c7dd3e673c0f   102327:
 b2d020b3c81918924bb9d51fd309ca2310a2c3c0   102319:
 a8206c47e5903b334c2c73d2c692f505dd3092d7   102303:
 3adb124d92b5512ce42bd951a696c461042f518d   102271:
 2a3b20fe38f37359b4d29ccfc2b979bae4fc0620 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/ocfs2/journal.c    | 2 +-
 trunk/fs/ocfs2/localalloc.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f206f87e39fd..892c97ecc11c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 461c6a30eca6f25add1dadb9fd8a1d8e89a6e627
+refs/heads/master: e407e39783a7206d20b3e9961aedf272de966e31
diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c
index 9698338adc39..a8c19cb3cfdd 100644
--- a/trunk/fs/ocfs2/journal.c
+++ b/trunk/fs/ocfs2/journal.c
@@ -329,7 +329,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks)
 
 	mlog(0, "Trying to extend transaction by %d blocks\n", nblocks);
 
-#ifdef OCFS2_DEBUG_FS
+#ifdef CONFIG_OCFS2_DEBUG_FS
 	status = 1;
 #else
 	status = journal_extend(handle, nblocks);
diff --git a/trunk/fs/ocfs2/localalloc.c b/trunk/fs/ocfs2/localalloc.c
index be774bdc8b36..28e492e4ec88 100644
--- a/trunk/fs/ocfs2/localalloc.c
+++ b/trunk/fs/ocfs2/localalloc.c
@@ -498,7 +498,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
 
 	alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
 
-#ifdef OCFS2_DEBUG_FS
+#ifdef CONFIG_OCFS2_DEBUG_FS
 	if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
 	    ocfs2_local_alloc_count_bits(alloc)) {
 		ocfs2_error(osb->sb, "local alloc inode %llu says it has "