Merge branch 'linus' into x86/urgent

Merge reason: Bring in changes that the next patch will depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 61f32f3868cd..b0435dd0654d 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -456,7 +456,7 @@ int cleanup_journal_tail(journal_t *journal)
 {
         transaction_t * transaction;
         tid_t           first_tid;
-        unsigned long   blocknr, freed;
+        unsigned int    blocknr, freed;
 
         if (is_journal_aborted(journal))
                 return 1;
@@ -502,8 +502,8 @@ int cleanup_journal_tail(journal_t *journal)
                 freed = freed + journal->j_last - journal->j_first;
 
         jbd_debug(1,
-                  "Cleaning journal tail from %d to %d (offset %lu), "
-                  "freeing %lu\n",
+                  "Cleaning journal tail from %d to %d (offset %u), "
+                  "freeing %u\n",
                   journal->j_tail_sequence, first_tid, blocknr, freed);
 
         journal->j_free += freed;