Commit 4978c659 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: use ext4_debug() instead of jbd_debug() 



We use jbd_debug() in some places in ext4. It seems a bit strange to use
jbd2 debugging output function for ext4 code. Also these days
ext4_debug() uses dynamic printk so each debug message can be enabled /
disabled on its own so the time when it made some sense to have these
combined (to allow easier common selecting of messages to report) has
passed. Just convert all jbd_debug() uses in ext4 to ext4_debug().

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarLukas Czerner <lczerner@redhat.com>
Link: https://lore.kernel.org/r/20220608112355.4397-1-jack@suse.cz


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

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ int ext4_should_retry_alloc(struct super_block *sb, int *retries) 
	 * it's possible we've just missed a transaction commit here,

	 * so ignore the returned status

	 */

	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);

	ext4_debug("%s: retrying operation after ENOSPC\n", sb->s_id);

	(void) jbd2_journal_force_commit_nested(sbi->s_journal);

	return 1;

}

fs/ext4/ext4_jbd2.c

+1 −2
Original line number Diff line number Diff line
@@ -267,8 +267,7 @@ int __ext4_forget(const char *where, unsigned int line, handle_t *handle, 
	trace_ext4_forget(inode, is_metadata, blocknr);

	BUFFER_TRACE(bh, "enter");



	jbd_debug(4, "forgetting bh %p: is_metadata = %d, mode %o, "

		  "data mode %x\n",

	ext4_debug("forgetting bh %p: is_metadata=%d, mode %o, data mode %x\n",

		  bh, is_metadata, inode->i_mode,

		  test_opt(inode->i_sb, DATA_FLAGS));

fs/ext4/fast_commit.c

+22 −22
Original line number Diff line number Diff line
@@ -917,8 +917,8 @@ static int ext4_fc_write_inode_data(struct inode *inode, u32 *crc) 
	mutex_unlock(&ei->i_fc_lock);



	cur_lblk_off = old_blk_size;

	jbd_debug(1, "%s: will try writing %d to %d for inode %ld\n",

		  __func__, cur_lblk_off, new_blk_size, inode->i_ino);

	ext4_debug("will try writing %d to %d for inode %ld\n",

		   cur_lblk_off, new_blk_size, inode->i_ino);



	while (cur_lblk_off <= new_blk_size) {

		map.m_lblk = cur_lblk_off;
@@ -1168,7 +1168,7 @@ static void ext4_fc_update_stats(struct super_block *sb, int status, 
{

	struct ext4_fc_stats *stats = &EXT4_SB(sb)->s_fc_stats;



	jbd_debug(1, "Fast commit ended with status = %d for tid %u",

	ext4_debug("Fast commit ended with status = %d for tid %u",

			status, commit_tid);

	if (status == EXT4_FC_STATUS_OK) {

		stats->fc_num_commits++;
@@ -1375,14 +1375,14 @@ static int ext4_fc_replay_unlink(struct super_block *sb, struct ext4_fc_tl *tl, 
	inode = ext4_iget(sb, darg.ino, EXT4_IGET_NORMAL);



	if (IS_ERR(inode)) {

		jbd_debug(1, "Inode %d not found", darg.ino);

		ext4_debug("Inode %d not found", darg.ino);

		return 0;

	}



	old_parent = ext4_iget(sb, darg.parent_ino,

				EXT4_IGET_NORMAL);

	if (IS_ERR(old_parent)) {

		jbd_debug(1, "Dir with inode  %d not found", darg.parent_ino);

		ext4_debug("Dir with inode %d not found", darg.parent_ino);

		iput(inode);

		return 0;

	}
@@ -1407,21 +1407,21 @@ static int ext4_fc_replay_link_internal(struct super_block *sb, 


	dir = ext4_iget(sb, darg->parent_ino, EXT4_IGET_NORMAL);

	if (IS_ERR(dir)) {

		jbd_debug(1, "Dir with inode %d not found.", darg->parent_ino);

		ext4_debug("Dir with inode %d not found.", darg->parent_ino);

		dir = NULL;

		goto out;

	}



	dentry_dir = d_obtain_alias(dir);

	if (IS_ERR(dentry_dir)) {

		jbd_debug(1, "Failed to obtain dentry");

		ext4_debug("Failed to obtain dentry");

		dentry_dir = NULL;

		goto out;

	}



	dentry_inode = d_alloc(dentry_dir, &qstr_dname);

	if (!dentry_inode) {

		jbd_debug(1, "Inode dentry not created.");

		ext4_debug("Inode dentry not created.");

		ret = -ENOMEM;

		goto out;

	}
@@ -1434,7 +1434,7 @@ static int ext4_fc_replay_link_internal(struct super_block *sb, 
	 * could complete.

	 */

	if (ret && ret != -EEXIST) {

		jbd_debug(1, "Failed to link\n");

		ext4_debug("Failed to link\n");

		goto out;

	}
@@ -1468,7 +1468,7 @@ static int ext4_fc_replay_link(struct super_block *sb, struct ext4_fc_tl *tl, 


	inode = ext4_iget(sb, darg.ino, EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		jbd_debug(1, "Inode not found.");

		ext4_debug("Inode not found.");

		return 0;

	}
@@ -1576,7 +1576,7 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl, 
	/* Given that we just wrote the inode on disk, this SHOULD succeed. */

	inode = ext4_iget(sb, ino, EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		jbd_debug(1, "Inode not found.");

		ext4_debug("Inode not found.");

		return -EFSCORRUPTED;

	}
@@ -1630,7 +1630,7 @@ static int ext4_fc_replay_create(struct super_block *sb, struct ext4_fc_tl *tl, 


	inode = ext4_iget(sb, darg.ino, EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		jbd_debug(1, "inode %d not found.", darg.ino);

		ext4_debug("inode %d not found.", darg.ino);

		inode = NULL;

		ret = -EINVAL;

		goto out;
@@ -1643,7 +1643,7 @@ static int ext4_fc_replay_create(struct super_block *sb, struct ext4_fc_tl *tl, 
		 */

		dir = ext4_iget(sb, darg.parent_ino, EXT4_IGET_NORMAL);

		if (IS_ERR(dir)) {

			jbd_debug(1, "Dir %d not found.", darg.ino);

			ext4_debug("Dir %d not found.", darg.ino);

			goto out;

		}

		ret = ext4_init_new_dir(NULL, dir, inode);
@@ -1727,7 +1727,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb, 


	inode = ext4_iget(sb, le32_to_cpu(fc_add_ex.fc_ino), EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		jbd_debug(1, "Inode not found.");

		ext4_debug("Inode not found.");

		return 0;

	}
@@ -1741,7 +1741,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb, 


	cur = start;

	remaining = len;

	jbd_debug(1, "ADD_RANGE, lblk %d, pblk %lld, len %d, unwritten %d, inode %ld\n",

	ext4_debug("ADD_RANGE, lblk %d, pblk %lld, len %d, unwritten %d, inode %ld\n",

		  start, start_pblk, len, ext4_ext_is_unwritten(ex),

		  inode->i_ino);
@@ -1802,7 +1802,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 %ld to %d %lld",

		ext4_debug("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,
@@ -1845,7 +1845,7 @@ ext4_fc_replay_del_range(struct super_block *sb, struct ext4_fc_tl *tl, 


	inode = ext4_iget(sb, le32_to_cpu(lrange.fc_ino), EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		jbd_debug(1, "Inode %d not found", le32_to_cpu(lrange.fc_ino));

		ext4_debug("Inode %d not found", le32_to_cpu(lrange.fc_ino));

		return 0;

	}
@@ -1853,7 +1853,7 @@ ext4_fc_replay_del_range(struct super_block *sb, struct ext4_fc_tl *tl, 
	if (ret)

		goto out;



	jbd_debug(1, "DEL_RANGE, inode %ld, lblk %d, len %d\n",

	ext4_debug("DEL_RANGE, inode %ld, lblk %d, len %d\n",

			inode->i_ino, le32_to_cpu(lrange.fc_lblk),

			le32_to_cpu(lrange.fc_len));

	while (remaining > 0) {
@@ -1902,7 +1902,7 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb) 
		inode = ext4_iget(sb, state->fc_modified_inodes[i],

			EXT4_IGET_NORMAL);

		if (IS_ERR(inode)) {

			jbd_debug(1, "Inode %d not found.",

			ext4_debug("Inode %d not found.",

				state->fc_modified_inodes[i]);

			continue;

		}
@@ -2031,7 +2031,7 @@ static int ext4_fc_replay_scan(journal_t *journal, 
	for (cur = start; cur < end; cur = cur + sizeof(tl) + le16_to_cpu(tl.fc_len)) {

		memcpy(&tl, cur, sizeof(tl));

		val = cur + sizeof(tl);

		jbd_debug(3, "Scan phase, tag:%s, blk %lld\n",

		ext4_debug("Scan phase, tag:%s, blk %lld\n",

			  tag2str(le16_to_cpu(tl.fc_tag)), bh->b_blocknr);

		switch (le16_to_cpu(tl.fc_tag)) {

		case EXT4_FC_TAG_ADD_RANGE:
@@ -2126,7 +2126,7 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, 
		sbi->s_mount_state |= EXT4_FC_REPLAY;

	}

	if (!sbi->s_fc_replay_state.fc_replay_num_tags) {

		jbd_debug(1, "Replay stops\n");

		ext4_debug("Replay stops\n");

		ext4_fc_set_bitmaps_and_counters(sb);

		return 0;

	}
@@ -2150,7 +2150,7 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, 
			ext4_fc_set_bitmaps_and_counters(sb);

			break;

		}

		jbd_debug(3, "Replay phase, tag:%s\n",

		ext4_debug("Replay phase, tag:%s\n",

				tag2str(le16_to_cpu(tl.fc_tag)));

		state->fc_replay_num_tags--;

		switch (le16_to_cpu(tl.fc_tag)) {

fs/ext4/indirect.c

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int ext4_splice_branch(handle_t *handle, 
		 * the new i_size.  But that is not done here - it is done in

		 * generic_commit_write->__mark_inode_dirty->ext4_dirty_inode.

		 */

		jbd_debug(5, "splicing indirect only\n");

		ext4_debug("splicing indirect only\n");

		BUFFER_TRACE(where->bh, "call ext4_handle_dirty_metadata");

		err = ext4_handle_dirty_metadata(handle, ar->inode, where->bh);

		if (err)
@@ -472,7 +472,7 @@ static int ext4_splice_branch(handle_t *handle, 
		err = ext4_mark_inode_dirty(handle, ar->inode);

		if (unlikely(err))

			goto err_out;

		jbd_debug(5, "splicing direct\n");

		ext4_debug("splicing direct\n");

	}

	return err;

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5213,7 +5213,7 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 


	if (EXT4_SB(inode->i_sb)->s_journal) {

		if (ext4_journal_current_handle()) {

			jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");

			ext4_debug("called recursively, non-PF_MEMALLOC!\n");

			dump_stack();

			return -EIO;

		}