jbd: Journal block numbers can ever be only 32-bit use unsigned int for them

It does not make sense to store block number for journal as unsigned long
since they can be only 32-bit (because of on-disk format limitation). So
change in-memory structures and variables to use unsigned int instead.

Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 9 insertions, 9 deletions

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index db5e982c5ddf..cb1a49ae605e 100644
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -70,7 +70,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
 {
         int err;
         unsigned int max, nbufs, next;
-        unsigned long blocknr;
+        unsigned int blocknr;
         struct buffer_head *bh;
 
         struct buffer_head * bufs[MAXBUF];
@@ -132,7 +132,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
                  unsigned int offset)
 {
         int err;
-        unsigned long blocknr;
+        unsigned int blocknr;
         struct buffer_head *bh;
 
         *bhp = NULL;
@@ -314,7 +314,7 @@ static int do_one_pass(journal_t *journal,
                         struct recovery_info *info, enum passtype pass)
 {
         unsigned int            first_commit_ID, next_commit_ID;
-        unsigned long           next_log_block;
+        unsigned int            next_log_block;
         int                     err, success = 0;
         journal_superblock_t *  sb;
         journal_header_t *      tmp;
@@ -367,14 +367,14 @@ static int do_one_pass(journal_t *journal,
                         if (tid_geq(next_commit_ID, info->end_transaction))
                                 break;
 
-                jbd_debug(2, "Scanning for sequence ID %u at %lu/%lu\n",
+                jbd_debug(2, "Scanning for sequence ID %u at %u/%u\n",
                           next_commit_ID, next_log_block, journal->j_last);
 
                 /* Skip over each chunk of the transaction looking
                  * either the next descriptor block or the final commit
                  * record. */
 
-                jbd_debug(3, "JBD: checking block %ld\n", next_log_block);
+                jbd_debug(3, "JBD: checking block %u\n", next_log_block);
                 err = jread(&bh, journal, next_log_block);
                 if (err)
                         goto failed;
@@ -429,7 +429,7 @@ static int do_one_pass(journal_t *journal,
                         tagp = &bh->b_data[sizeof(journal_header_t)];
                         while ((tagp - bh->b_data +sizeof(journal_block_tag_t))
                                <= journal->j_blocksize) {
-                                unsigned long io_block;
+                                unsigned int io_block;
 
                                 tag = (journal_block_tag_t *) tagp;
                                 flags = be32_to_cpu(tag->t_flags);
@@ -443,10 +443,10 @@ static int do_one_pass(journal_t *journal,
                                         success = err;
                                         printk (KERN_ERR
                                                 "JBD: IO error %d recovering "
-                                                "block %ld in log\n",
+                                                "block %u in log\n",
                                                 err, io_block);
                                 } else {
-                                        unsigned long blocknr;
+                                        unsigned int blocknr;
 
                                         J_ASSERT(obh != NULL);
                                         blocknr = be32_to_cpu(tag->t_blocknr);
@@ -581,7 +581,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,
         max = be32_to_cpu(header->r_count);
 
         while (offset < max) {
-                unsigned long blocknr;
+                unsigned int blocknr;
                 int err;
 
                 blocknr = be32_to_cpu(* ((__be32 *) (bh->b_data+offset)));