Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e407e397 authored Jun 12, 2008 by Joel Becker Committed by Mark Fasheh Jul 14, 2008

ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs



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>

parent 461c6a30

fs/ocfs2/journal.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -329,7 +329,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks)

	mlog(0, "Trying to extend transaction by %d blocks\n", nblocks);		mlog(0, "Trying to extend transaction by %d blocks\n", nblocks);

	#ifdef OCFS2_DEBUG_FS		#ifdef CONFIG_OCFS2_DEBUG_FS
	status = 1;		status = 1;
	#else		#else
	status = journal_extend(handle, nblocks);		status = journal_extend(handle, nblocks);

fs/ocfs2/localalloc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -498,7 +498,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,

	alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;		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) !=		if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
	ocfs2_local_alloc_count_bits(alloc)) {		ocfs2_local_alloc_count_bits(alloc)) {
	ocfs2_error(osb->sb, "local alloc inode %llu says it has "		ocfs2_error(osb->sb, "local alloc inode %llu says it has "