Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7821ce41 authored by Gaowei Pu's avatar Gaowei Pu Committed by Theodore Ts'o
Browse files

jbd2: fix some print format mistakes 



There are some print format mistakes in debug messages. Fix them.

Signed-off-by: default avatarGaowei Pu <pugaowei@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent b9c1c267

fs/jbd2/journal.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -203,7 +203,7 @@ static int kjournald2(void *arg) 
	if (journal->j_flags & JBD2_UNMOUNT)

	if (journal->j_flags & JBD2_UNMOUNT)

		goto end_loop;

		goto end_loop;





	jbd_debug(1, "commit_sequence=%d, commit_request=%d\n",

	jbd_debug(1, "commit_sequence=%u, commit_request=%u\n",

		journal->j_commit_sequence, journal->j_commit_request);

		journal->j_commit_sequence, journal->j_commit_request);





	if (journal->j_commit_sequence != journal->j_commit_request) {

	if (journal->j_commit_sequence != journal->j_commit_request) {
@@ -500,7 +500,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t target) 
		 */

		 */





		journal->j_commit_request = target;

		journal->j_commit_request = target;

		jbd_debug(1, "JBD2: requesting commit %d/%d\n",

		jbd_debug(1, "JBD2: requesting commit %u/%u\n",

			  journal->j_commit_request,

			  journal->j_commit_request,

			  journal->j_commit_sequence);

			  journal->j_commit_sequence);

		journal->j_running_transaction->t_requested = jiffies;

		journal->j_running_transaction->t_requested = jiffies;
@@ -698,12 +698,12 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) 
#ifdef CONFIG_JBD2_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	if (!tid_geq(journal->j_commit_request, tid)) {

	if (!tid_geq(journal->j_commit_request, tid)) {

		printk(KERN_ERR

		printk(KERN_ERR

		       "%s: error: j_commit_request=%d, tid=%d\n",

		       "%s: error: j_commit_request=%u, tid=%u\n",

		       __func__, journal->j_commit_request, tid);

		       __func__, journal->j_commit_request, tid);

	}

	}

#endif

#endif

	while (tid_gt(tid, journal->j_commit_sequence)) {

	while (tid_gt(tid, journal->j_commit_sequence)) {

		jbd_debug(1, "JBD2: want %d, j_commit_sequence=%d\n",

		jbd_debug(1, "JBD2: want %u, j_commit_sequence=%u\n",

				  tid, journal->j_commit_sequence);

				  tid, journal->j_commit_sequence);

		read_unlock(&journal->j_state_lock);

		read_unlock(&journal->j_state_lock);

		wake_up(&journal->j_wait_commit);

		wake_up(&journal->j_wait_commit);
@@ -944,7 +944,7 @@ int __jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block) 




	trace_jbd2_update_log_tail(journal, tid, block, freed);

	trace_jbd2_update_log_tail(journal, tid, block, freed);

	jbd_debug(1,

	jbd_debug(1,

		  "Cleaning journal tail from %d to %d (offset %lu), "

		  "Cleaning journal tail from %u to %u (offset %lu), "

		  "freeing %lu\n",

		  "freeing %lu\n",

		  journal->j_tail_sequence, tid, block, freed);

		  journal->j_tail_sequence, tid, block, freed);
@@ -1318,7 +1318,7 @@ static int journal_reset(journal_t *journal) 
	 */

	 */

	if (sb->s_start == 0) {

	if (sb->s_start == 0) {

		jbd_debug(1, "JBD2: Skipping superblock update on recovered sb "

		jbd_debug(1, "JBD2: Skipping superblock update on recovered sb "

			"(start %ld, seq %d, errno %d)\n",

			"(start %ld, seq %u, errno %d)\n",

			journal->j_tail, journal->j_tail_sequence,

			journal->j_tail, journal->j_tail_sequence,

			journal->j_errno);

			journal->j_errno);

		journal->j_flags |= JBD2_FLUSHED;

		journal->j_flags |= JBD2_FLUSHED;
@@ -1453,7 +1453,7 @@ static void jbd2_mark_journal_empty(journal_t *journal, int write_op) 
		return;

		return;

	}

	}





	jbd_debug(1, "JBD2: Marking journal as empty (seq %d)\n",

	jbd_debug(1, "JBD2: Marking journal as empty (seq %u)\n",

		  journal->j_tail_sequence);

		  journal->j_tail_sequence);





	sb->s_sequence = cpu_to_be32(journal->j_tail_sequence);

	sb->s_sequence = cpu_to_be32(journal->j_tail_sequence);