Commit b38bd33a authored Jul 19, 2007 by Mingming Cao Committed by Linus Torvalds Jul 19, 2007

fix ext4/JBD2 build warnings

Looking at the current linus-git tree jbd_debug() define in
include/linux/jbd2.h

extern u8 journal_enable_debug;

#define jbd_debug(n, f, a...)                                           \
        do {                                                            \
                if ((n) <= journal_enable_debug) {                      \
                        printk (KERN_DEBUG "(%s, %d): %s: ",            \
                                __FILE__, __LINE__, __FUNCTION__);      \
                        printk (f, ## a);                               \
                }                                                       \
        } while (0)
> fs/ext4/inode.c: In function âext4_write_inodeâ:
> fs/ext4/inode.c:2906: warning: comparison is always true due to limited
> range of data type
>
> fs/jbd2/recovery.c: In function âjbd2_journal_recoverâ:
> fs/jbd2/recovery.c:254: warning: comparison is always true due to
> limited range of data type
> fs/jbd2/recovery.c:257: warning: comparison is always true due to
> limited range of data type
>
> fs/jbd2/recovery.c: In function âjbd2_journal_skip_recoveryâ:
> fs/jbd2/recovery.c:301: warning: comparison is always true due to
> limited range of data type
>
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: Mingming Cao <cmm@us.ibm.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Theodore Tso <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f0a594c1

fs/ext4/inode.c

+1 −1

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

		if (ext4_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/jbd2/recovery.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -251,10 +251,10 @@ int jbd2_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
		@@ -298,7 +298,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
		#ifdef CONFIG_JBD2_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