summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaowei Pu <pugaowei@gmail.com>2019-05-30 15:08:34 -0400
committerTheodore Ts'o <tytso@mit.edu>2019-05-30 15:08:34 -0400
commit7821ce417ec730a80d46ad0a513a84692433a5e8 (patch)
treef9dbfda08ad720c9943dc898f4292e7715e82540
parentb9c1c26739ec2d4b4fb70207a0a9ad6747e43f4c (diff)
jbd2: fix some print format mistakes
There are some print format mistakes in debug messages. Fix them. Signed-off-by: Gaowei Pu <pugaowei@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/jbd2/journal.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 43df0c943229..38b426c5ed03 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -203,7 +203,7 @@ loop:
203 if (journal->j_flags & JBD2_UNMOUNT) 203 if (journal->j_flags & JBD2_UNMOUNT)
204 goto end_loop; 204 goto end_loop;
205 205
206 jbd_debug(1, "commit_sequence=%d, commit_request=%d\n", 206 jbd_debug(1, "commit_sequence=%u, commit_request=%u\n",
207 journal->j_commit_sequence, journal->j_commit_request); 207 journal->j_commit_sequence, journal->j_commit_request);
208 208
209 if (journal->j_commit_sequence != journal->j_commit_request) { 209 if (journal->j_commit_sequence != journal->j_commit_request) {
@@ -324,7 +324,7 @@ static void journal_kill_thread(journal_t *journal)
324 * IO is in progress. do_get_write_access() handles this. 324 * IO is in progress. do_get_write_access() handles this.
325 * 325 *
326 * The function returns a pointer to the buffer_head to be used for IO. 326 * The function returns a pointer to the buffer_head to be used for IO.
327 * 327 *
328 * 328 *
329 * Return value: 329 * Return value:
330 * <0: Error 330 * <0: Error
@@ -500,7 +500,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t target)
500 */ 500 */
501 501
502 journal->j_commit_request = target; 502 journal->j_commit_request = target;
503 jbd_debug(1, "JBD2: requesting commit %d/%d\n", 503 jbd_debug(1, "JBD2: requesting commit %u/%u\n",
504 journal->j_commit_request, 504 journal->j_commit_request,
505 journal->j_commit_sequence); 505 journal->j_commit_sequence);
506 journal->j_running_transaction->t_requested = jiffies; 506 journal->j_running_transaction->t_requested = jiffies;
@@ -513,7 +513,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t target)
513 WARN_ONCE(1, "JBD2: bad log_start_commit: %u %u %u %u\n", 513 WARN_ONCE(1, "JBD2: bad log_start_commit: %u %u %u %u\n",
514 journal->j_commit_request, 514 journal->j_commit_request,
515 journal->j_commit_sequence, 515 journal->j_commit_sequence,
516 target, journal->j_running_transaction ? 516 target, journal->j_running_transaction ?
517 journal->j_running_transaction->t_tid : 0); 517 journal->j_running_transaction->t_tid : 0);
518 return 0; 518 return 0;
519} 519}
@@ -698,12 +698,12 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
698#ifdef CONFIG_JBD2_DEBUG 698#ifdef CONFIG_JBD2_DEBUG
699 if (!tid_geq(journal->j_commit_request, tid)) { 699 if (!tid_geq(journal->j_commit_request, tid)) {
700 printk(KERN_ERR 700 printk(KERN_ERR
701 "%s: error: j_commit_request=%d, tid=%d\n", 701 "%s: error: j_commit_request=%u, tid=%u\n",
702 __func__, journal->j_commit_request, tid); 702 __func__, journal->j_commit_request, tid);
703 } 703 }
704#endif 704#endif
705 while (tid_gt(tid, journal->j_commit_sequence)) { 705 while (tid_gt(tid, journal->j_commit_sequence)) {
706 jbd_debug(1, "JBD2: want %d, j_commit_sequence=%d\n", 706 jbd_debug(1, "JBD2: want %u, j_commit_sequence=%u\n",
707 tid, journal->j_commit_sequence); 707 tid, journal->j_commit_sequence);
708 read_unlock(&journal->j_state_lock); 708 read_unlock(&journal->j_state_lock);
709 wake_up(&journal->j_wait_commit); 709 wake_up(&journal->j_wait_commit);
@@ -944,7 +944,7 @@ int __jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block)
944 944
945 trace_jbd2_update_log_tail(journal, tid, block, freed); 945 trace_jbd2_update_log_tail(journal, tid, block, freed);
946 jbd_debug(1, 946 jbd_debug(1,
947 "Cleaning journal tail from %d to %d (offset %lu), " 947 "Cleaning journal tail from %u to %u (offset %lu), "
948 "freeing %lu\n", 948 "freeing %lu\n",
949 journal->j_tail_sequence, tid, block, freed); 949 journal->j_tail_sequence, tid, block, freed);
950 950
@@ -1318,7 +1318,7 @@ static int journal_reset(journal_t *journal)
1318 */ 1318 */
1319 if (sb->s_start == 0) { 1319 if (sb->s_start == 0) {
1320 jbd_debug(1, "JBD2: Skipping superblock update on recovered sb " 1320 jbd_debug(1, "JBD2: Skipping superblock update on recovered sb "
1321 "(start %ld, seq %d, errno %d)\n", 1321 "(start %ld, seq %u, errno %d)\n",
1322 journal->j_tail, journal->j_tail_sequence, 1322 journal->j_tail, journal->j_tail_sequence,
1323 journal->j_errno); 1323 journal->j_errno);
1324 journal->j_flags |= JBD2_FLUSHED; 1324 journal->j_flags |= JBD2_FLUSHED;
@@ -1453,7 +1453,7 @@ static void jbd2_mark_journal_empty(journal_t *journal, int write_op)
1453 return; 1453 return;
1454 } 1454 }
1455 1455
1456 jbd_debug(1, "JBD2: Marking journal as empty (seq %d)\n", 1456 jbd_debug(1, "JBD2: Marking journal as empty (seq %u)\n",
1457 journal->j_tail_sequence); 1457 journal->j_tail_sequence);
1458 1458
1459 sb->s_sequence = cpu_to_be32(journal->j_tail_sequence); 1459 sb->s_sequence = cpu_to_be32(journal->j_tail_sequence);