]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs
authorJoel Becker <joel.becker@oracle.com>
Fri, 13 Jun 2008 05:35:39 +0000 (22:35 -0700)
committerMark Fasheh <mfasheh@suse.com>
Mon, 14 Jul 2008 20:57:15 +0000 (13:57 -0700)
A couple places use OCFS2_DEBUG_FS where they really mean
CONFIG_OCFS2_DEBUG_FS.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
fs/ocfs2/journal.c
fs/ocfs2/localalloc.c

index 9698338adc3915e66a3db0eda77268e33b51f607..a8c19cb3cfdd874235d16fc3926c9f9e07bba794 100644 (file)
@@ -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);
index be774bdc8b3658bdec41332f49a3d8d1e4df5a58..28e492e4ec88b913964ffd49bcda163fb4f7690f 100644 (file)
@@ -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 "