Commit 9ad163ae authored Oct 18, 2007 by Jose R. Santos Committed by Linus Torvalds Oct 19, 2007

JBD: Fix JBD warnings when compiling with CONFIG_JBD_DEBUG

Note from Mingming's JBD2 fix:

Noticed all warnings are occurs when the debug level is 0.  Then found the
"jbd2: Move jbd2-debug file to debugfs" patch
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0f49d5d019afa4e94253bfc92f0daca3badb990b



changed the jbd2_journal_enable_debug from int type to u8, makes the
jbd_debug comparision is always true when the debugging level is 0.  Thus
the compile warning occurs.

Thought about changing the jbd2_journal_enable_debug data type back to int,
but can't, because the jbd2-debug is moved to debug fs, where calling
debugfs_create_u8() to create the debugfs entry needs the value to be u8
type.

Even if we changed the data type back to int, the code is still buggy,
kernel should not print jbd2 debug message if the jbd2_journal_enable_debug
is set to 0.  But this is not the case.

The fix is change the level of debugging to 1.  The same should fixed in
ext3/JBD, but currently ext3 jbd-debug via /proc fs is broken, so we
probably should fix it all together.

Signed-off-by: Jose R. Santos <jrs@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7a266e75

fs/ext3/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2954,7 +2954,7 @@ int ext3_write_inode(struct inode *inode, int wait)
		return 0;

		if (ext3_journal_current_handle()) {
		jbd_debug(0, "called recursively, non-PF_MEMALLOC!\n");
		jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");
		dump_stack();
		return -EIO;
		}

fs/jbd/recovery.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -250,10 +250,10 @@ int journal_recover(journal_t *journal)
		if (!err)
		err = do_one_pass(journal, &info, PASS_REPLAY);

		jbd_debug(0, "JBD: recovery, exit status %d, "
		jbd_debug(1, "JBD: recovery, exit status %d, "
		"recovered transactions %u to %u\n",
		err, info.start_transaction, info.end_transaction);
		jbd_debug(0, "JBD: Replayed %d and revoked %d/%d blocks\n",
		jbd_debug(1, "JBD: Replayed %d and revoked %d/%d blocks\n",
		info.nr_replays, info.nr_revoke_hits, info.nr_revokes);

		/* Restart the log at the next transaction ID, thus invalidating
		@@ -297,7 +297,7 @@ int journal_skip_recovery(journal_t *journal)
		#ifdef CONFIG_JBD_DEBUG
		int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence);
		#endif
		jbd_debug(0,
		jbd_debug(1,
		"JBD: ignoring %d transaction%s from the journal.\n",
		dropped, (dropped == 1) ? "" : "s");
		journal->j_transaction_sequence = ++info.end_transaction;

Admin message