Commit fcdf3c34 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Theodore Ts'o
Browse files

ext4: fix debug format string warning 



Using no_printk() for jbd_debug() revealed two warnings:

fs/jbd2/recovery.c: In function 'fc_do_one_pass':
fs/jbd2/recovery.c:256:30: error: format '%d' expects a matching 'int' argument [-Werror=format=]
  256 |                 jbd_debug(3, "Processing fast commit blk with seq %d");
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/ext4/fast_commit.c: In function 'ext4_fc_replay_add_range':
fs/ext4/fast_commit.c:1732:30: error: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Werror=format=]
 1732 |                 jbd_debug(1, "Converting from %d to %d %lld",

The first one was added incorrectly, and was also missing a few newlines
in debug output, and the second one happened when the type of an
argument changed.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: d5564351 ("jbd2: avoid -Wempty-body warnings")
Fixes: 6db07461 ("ext4: use BIT() macro for BH_** state bits")
Fixes: 5b849b5f ("jbd2: fast commit recovery path")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210409201211.1866633-1-arnd@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 666245d9

fs/ext4/fast_commit.c

+1 −1
Original line number Diff line number Diff line
@@ -1736,7 +1736,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb, 
		}



		/* Range is mapped and needs a state change */

		jbd_debug(1, "Converting from %d to %d %lld",

		jbd_debug(1, "Converting from %ld to %d %lld",

				map.m_flags & EXT4_MAP_UNWRITTEN,

			ext4_ext_is_unwritten(ex), map.m_pblk);

		ret = ext4_ext_replay_update_ex(inode, cur, map.m_len,

fs/jbd2/recovery.c

+2 −3
Original line number Diff line number Diff line
@@ -245,15 +245,14 @@ static int fc_do_one_pass(journal_t *journal, 
		return 0;



	while (next_fc_block <= journal->j_fc_last) {

		jbd_debug(3, "Fast commit replay: next block %ld",

		jbd_debug(3, "Fast commit replay: next block %ld\n",

			  next_fc_block);

		err = jread(&bh, journal, next_fc_block);

		if (err) {

			jbd_debug(3, "Fast commit replay: read error");

			jbd_debug(3, "Fast commit replay: read error\n");

			break;

		}



		jbd_debug(3, "Processing fast commit blk with seq %d");

		err = journal->j_fc_replay_callback(journal, bh, pass,

					next_fc_block - journal->j_fc_first,

					expected_commit_id);