mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
jbd2: rename jbd_debug() to jbd2_debug()
The name of jbd_debug() is confusing as all functions inside jbd2 have jbd2_ prefix. Rename jbd_debug() to jbd2_debug(). No functional changes. Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Lukas Czerner <lczerner@redhat.com> Link: https://lore.kernel.org/r/20220608112355.4397-2-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
@@ -373,7 +373,7 @@ alloc_transaction:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
jbd_debug(3, "New handle %p going live.\n", handle);
|
||||
jbd2_debug(3, "New handle %p going live.\n", handle);
|
||||
|
||||
/*
|
||||
* We need to hold j_state_lock until t_updates has been incremented,
|
||||
@@ -453,7 +453,7 @@ repeat:
|
||||
handle->h_start_jiffies = jiffies;
|
||||
atomic_inc(&transaction->t_updates);
|
||||
atomic_inc(&transaction->t_handle_count);
|
||||
jbd_debug(4, "Handle %p given %d credits (total %d, free %lu)\n",
|
||||
jbd2_debug(4, "Handle %p given %d credits (total %d, free %lu)\n",
|
||||
handle, blocks,
|
||||
atomic_read(&transaction->t_outstanding_credits),
|
||||
jbd2_log_space_left(journal));
|
||||
@@ -674,7 +674,7 @@ int jbd2_journal_extend(handle_t *handle, int nblocks, int revoke_records)
|
||||
|
||||
/* Don't extend a locked-down transaction! */
|
||||
if (transaction->t_state != T_RUNNING) {
|
||||
jbd_debug(3, "denied handle %p %d blocks: "
|
||||
jbd2_debug(3, "denied handle %p %d blocks: "
|
||||
"transaction not running\n", handle, nblocks);
|
||||
goto error_out;
|
||||
}
|
||||
@@ -689,7 +689,7 @@ int jbd2_journal_extend(handle_t *handle, int nblocks, int revoke_records)
|
||||
&transaction->t_outstanding_credits);
|
||||
|
||||
if (wanted > journal->j_max_transaction_buffers) {
|
||||
jbd_debug(3, "denied handle %p %d blocks: "
|
||||
jbd2_debug(3, "denied handle %p %d blocks: "
|
||||
"transaction too large\n", handle, nblocks);
|
||||
atomic_sub(nblocks, &transaction->t_outstanding_credits);
|
||||
goto error_out;
|
||||
@@ -707,7 +707,7 @@ int jbd2_journal_extend(handle_t *handle, int nblocks, int revoke_records)
|
||||
handle->h_revoke_credits_requested += revoke_records;
|
||||
result = 0;
|
||||
|
||||
jbd_debug(3, "extended handle %p by %d\n", handle, nblocks);
|
||||
jbd2_debug(3, "extended handle %p by %d\n", handle, nblocks);
|
||||
error_out:
|
||||
read_unlock(&journal->j_state_lock);
|
||||
return result;
|
||||
@@ -795,7 +795,7 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, int revoke_records,
|
||||
* First unlink the handle from its current transaction, and start the
|
||||
* commit on that.
|
||||
*/
|
||||
jbd_debug(2, "restarting handle %p\n", handle);
|
||||
jbd2_debug(2, "restarting handle %p\n", handle);
|
||||
stop_this_handle(handle);
|
||||
handle->h_transaction = NULL;
|
||||
|
||||
@@ -979,7 +979,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
|
||||
|
||||
journal = transaction->t_journal;
|
||||
|
||||
jbd_debug(5, "journal_head %p, force_copy %d\n", jh, force_copy);
|
||||
jbd2_debug(5, "journal_head %p, force_copy %d\n", jh, force_copy);
|
||||
|
||||
JBUFFER_TRACE(jh, "entry");
|
||||
repeat:
|
||||
@@ -1271,7 +1271,7 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh)
|
||||
struct journal_head *jh = jbd2_journal_add_journal_head(bh);
|
||||
int err;
|
||||
|
||||
jbd_debug(5, "journal_head %p\n", jh);
|
||||
jbd2_debug(5, "journal_head %p\n", jh);
|
||||
err = -EROFS;
|
||||
if (is_handle_aborted(handle))
|
||||
goto out;
|
||||
@@ -1496,7 +1496,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
|
||||
* of the running transaction.
|
||||
*/
|
||||
jh = bh2jh(bh);
|
||||
jbd_debug(5, "journal_head %p\n", jh);
|
||||
jbd2_debug(5, "journal_head %p\n", jh);
|
||||
JBUFFER_TRACE(jh, "entry");
|
||||
|
||||
/*
|
||||
@@ -1818,7 +1818,7 @@ int jbd2_journal_stop(handle_t *handle)
|
||||
pid_t pid;
|
||||
|
||||
if (--handle->h_ref > 0) {
|
||||
jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1,
|
||||
jbd2_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1,
|
||||
handle->h_ref);
|
||||
if (is_handle_aborted(handle))
|
||||
return -EIO;
|
||||
@@ -1838,7 +1838,7 @@ int jbd2_journal_stop(handle_t *handle)
|
||||
if (is_handle_aborted(handle))
|
||||
err = -EIO;
|
||||
|
||||
jbd_debug(4, "Handle %p going down\n", handle);
|
||||
jbd2_debug(4, "Handle %p going down\n", handle);
|
||||
trace_jbd2_handle_stats(journal->j_fs_dev->bd_dev,
|
||||
tid, handle->h_type, handle->h_line_no,
|
||||
jiffies - handle->h_start_jiffies,
|
||||
@@ -1916,7 +1916,7 @@ int jbd2_journal_stop(handle_t *handle)
|
||||
* completes the commit thread, it just doesn't write
|
||||
* anything to disk. */
|
||||
|
||||
jbd_debug(2, "transaction too old, requesting commit for "
|
||||
jbd2_debug(2, "transaction too old, requesting commit for "
|
||||
"handle %p\n", handle);
|
||||
/* This is non-blocking */
|
||||
jbd2_log_start_commit(journal, tid);
|
||||
@@ -2662,7 +2662,7 @@ static int jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *jinode,
|
||||
return -EROFS;
|
||||
journal = transaction->t_journal;
|
||||
|
||||
jbd_debug(4, "Adding inode %lu, tid:%d\n", jinode->i_vfs_inode->i_ino,
|
||||
jbd2_debug(4, "Adding inode %lu, tid:%d\n", jinode->i_vfs_inode->i_ino,
|
||||
transaction->t_tid);
|
||||
|
||||
spin_lock(&journal->j_list_lock);
|
||||
|
||||
Reference in New Issue
Block a user