diff options
author | Jan Kara <jack@suse.cz> | 2009-08-03 13:21:00 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2009-09-16 11:44:10 -0400 |
commit | 9c28cbccec66a5ca292c6659bf5a0fe0c8459fa7 (patch) | |
tree | d43540ca30413ac8b3717e29f15ccbbe789a76c5 /fs | |
parent | 19003c18e9b41f5c3aeb81c92356f90958e1f22f (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jbd/checkpoint.c | 6 | ||||
-rw-r--r-- | fs/jbd/commit.c | 2 | ||||
-rw-r--r-- | fs/jbd/journal.c | 30 | ||||
-rw-r--r-- | fs/jbd/recovery.c | 18 | ||||
-rw-r--r-- | fs/jbd/revoke.c | 16 |
5 files changed, 36 insertions, 36 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) | |||
456 | { | 456 | { |
457 | transaction_t * transaction; | 457 | transaction_t * transaction; |
458 | tid_t first_tid; | 458 | tid_t first_tid; |
459 | unsigned long blocknr, freed; | 459 | unsigned int blocknr, freed; |
460 | 460 | ||
461 | if (is_journal_aborted(journal)) | 461 | if (is_journal_aborted(journal)) |
462 | return 1; | 462 | return 1; |
@@ -502,8 +502,8 @@ int cleanup_journal_tail(journal_t *journal) | |||
502 | freed = freed + journal->j_last - journal->j_first; | 502 | freed = freed + journal->j_last - journal->j_first; |
503 | 503 | ||
504 | jbd_debug(1, | 504 | jbd_debug(1, |
505 | "Cleaning journal tail from %d to %d (offset %lu), " | 505 | "Cleaning journal tail from %d to %d (offset %u), " |
506 | "freeing %lu\n", | 506 | "freeing %u\n", |
507 | journal->j_tail_sequence, first_tid, blocknr, freed); | 507 | journal->j_tail_sequence, first_tid, blocknr, freed); |
508 | 508 | ||
509 | journal->j_free += freed; | 509 | journal->j_free += freed; |
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 618e21c0b7a3..4bd882548c45 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
@@ -308,7 +308,7 @@ void journal_commit_transaction(journal_t *journal) | |||
308 | int bufs; | 308 | int bufs; |
309 | int flags; | 309 | int flags; |
310 | int err; | 310 | int err; |
311 | unsigned long blocknr; | 311 | unsigned int blocknr; |
312 | ktime_t start_time; | 312 | ktime_t start_time; |
313 | u64 commit_time; | 313 | u64 commit_time; |
314 | char *tagp = NULL; | 314 | char *tagp = NULL; |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index f96f85092d1c..bd3c073b485d 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -276,7 +276,7 @@ static void journal_kill_thread(journal_t *journal) | |||
276 | int journal_write_metadata_buffer(transaction_t *transaction, | 276 | int journal_write_metadata_buffer(transaction_t *transaction, |
277 | struct journal_head *jh_in, | 277 | struct journal_head *jh_in, |
278 | struct journal_head **jh_out, | 278 | struct journal_head **jh_out, |
279 | unsigned long blocknr) | 279 | unsigned int blocknr) |
280 | { | 280 | { |
281 | int need_copy_out = 0; | 281 | int need_copy_out = 0; |
282 | int done_copy_out = 0; | 282 | int done_copy_out = 0; |
@@ -567,9 +567,9 @@ int log_wait_commit(journal_t *journal, tid_t tid) | |||
567 | * Log buffer allocation routines: | 567 | * Log buffer allocation routines: |
568 | */ | 568 | */ |
569 | 569 | ||
570 | int journal_next_log_block(journal_t *journal, unsigned long *retp) | 570 | int journal_next_log_block(journal_t *journal, unsigned int *retp) |
571 | { | 571 | { |
572 | unsigned long blocknr; | 572 | unsigned int blocknr; |
573 | 573 | ||
574 | spin_lock(&journal->j_state_lock); | 574 | spin_lock(&journal->j_state_lock); |
575 | J_ASSERT(journal->j_free > 1); | 575 | J_ASSERT(journal->j_free > 1); |
@@ -590,11 +590,11 @@ int journal_next_log_block(journal_t *journal, unsigned long *retp) | |||
590 | * this is a no-op. If needed, we can use j_blk_offset - everything is | 590 | * this is a no-op. If needed, we can use j_blk_offset - everything is |
591 | * ready. | 591 | * ready. |
592 | */ | 592 | */ |
593 | int journal_bmap(journal_t *journal, unsigned long blocknr, | 593 | int journal_bmap(journal_t *journal, unsigned int blocknr, |
594 | unsigned long *retp) | 594 | unsigned int *retp) |
595 | { | 595 | { |
596 | int err = 0; | 596 | int err = 0; |
597 | unsigned long ret; | 597 | unsigned int ret; |
598 | 598 | ||
599 | if (journal->j_inode) { | 599 | if (journal->j_inode) { |
600 | ret = bmap(journal->j_inode, blocknr); | 600 | ret = bmap(journal->j_inode, blocknr); |
@@ -604,7 +604,7 @@ int journal_bmap(journal_t *journal, unsigned long blocknr, | |||
604 | char b[BDEVNAME_SIZE]; | 604 | char b[BDEVNAME_SIZE]; |
605 | 605 | ||
606 | printk(KERN_ALERT "%s: journal block not found " | 606 | printk(KERN_ALERT "%s: journal block not found " |
607 | "at offset %lu on %s\n", | 607 | "at offset %u on %s\n", |
608 | __func__, | 608 | __func__, |
609 | blocknr, | 609 | blocknr, |
610 | bdevname(journal->j_dev, b)); | 610 | bdevname(journal->j_dev, b)); |
@@ -630,7 +630,7 @@ int journal_bmap(journal_t *journal, unsigned long blocknr, | |||
630 | struct journal_head *journal_get_descriptor_buffer(journal_t *journal) | 630 | struct journal_head *journal_get_descriptor_buffer(journal_t *journal) |
631 | { | 631 | { |
632 | struct buffer_head *bh; | 632 | struct buffer_head *bh; |
633 | unsigned long blocknr; | 633 | unsigned int blocknr; |
634 | int err; | 634 | int err; |
635 | 635 | ||
636 | err = journal_next_log_block(journal, &blocknr); | 636 | err = journal_next_log_block(journal, &blocknr); |
@@ -774,7 +774,7 @@ journal_t * journal_init_inode (struct inode *inode) | |||
774 | journal_t *journal = journal_init_common(); | 774 | journal_t *journal = journal_init_common(); |
775 | int err; | 775 | int err; |
776 | int n; | 776 | int n; |
777 | unsigned long blocknr; | 777 | unsigned int blocknr; |
778 | 778 | ||
779 | if (!journal) | 779 | if (!journal) |
780 | return NULL; | 780 | return NULL; |
@@ -846,12 +846,12 @@ static void journal_fail_superblock (journal_t *journal) | |||
846 | static int journal_reset(journal_t *journal) | 846 | static int journal_reset(journal_t *journal) |
847 | { | 847 | { |
848 | journal_superblock_t *sb = journal->j_superblock; | 848 | journal_superblock_t *sb = journal->j_superblock; |
849 | unsigned long first, last; | 849 | unsigned int first, last; |
850 | 850 | ||
851 | first = be32_to_cpu(sb->s_first); | 851 | first = be32_to_cpu(sb->s_first); |
852 | last = be32_to_cpu(sb->s_maxlen); | 852 | last = be32_to_cpu(sb->s_maxlen); |
853 | if (first + JFS_MIN_JOURNAL_BLOCKS > last + 1) { | 853 | if (first + JFS_MIN_JOURNAL_BLOCKS > last + 1) { |
854 | printk(KERN_ERR "JBD: Journal too short (blocks %lu-%lu).\n", | 854 | printk(KERN_ERR "JBD: Journal too short (blocks %u-%u).\n", |
855 | first, last); | 855 | first, last); |
856 | journal_fail_superblock(journal); | 856 | journal_fail_superblock(journal); |
857 | return -EINVAL; | 857 | return -EINVAL; |
@@ -885,7 +885,7 @@ static int journal_reset(journal_t *journal) | |||
885 | **/ | 885 | **/ |
886 | int journal_create(journal_t *journal) | 886 | int journal_create(journal_t *journal) |
887 | { | 887 | { |
888 | unsigned long blocknr; | 888 | unsigned int blocknr; |
889 | struct buffer_head *bh; | 889 | struct buffer_head *bh; |
890 | journal_superblock_t *sb; | 890 | journal_superblock_t *sb; |
891 | int i, err; | 891 | int i, err; |
@@ -969,14 +969,14 @@ void journal_update_superblock(journal_t *journal, int wait) | |||
969 | if (sb->s_start == 0 && journal->j_tail_sequence == | 969 | if (sb->s_start == 0 && journal->j_tail_sequence == |
970 | journal->j_transaction_sequence) { | 970 | journal->j_transaction_sequence) { |
971 | jbd_debug(1,"JBD: Skipping superblock update on recovered sb " | 971 | jbd_debug(1,"JBD: Skipping superblock update on recovered sb " |
972 | "(start %ld, seq %d, errno %d)\n", | 972 | "(start %u, seq %d, errno %d)\n", |
973 | journal->j_tail, journal->j_tail_sequence, | 973 | journal->j_tail, journal->j_tail_sequence, |
974 | journal->j_errno); | 974 | journal->j_errno); |
975 | goto out; | 975 | goto out; |
976 | } | 976 | } |
977 | 977 | ||
978 | spin_lock(&journal->j_state_lock); | 978 | spin_lock(&journal->j_state_lock); |
979 | jbd_debug(1,"JBD: updating superblock (start %ld, seq %d, errno %d)\n", | 979 | jbd_debug(1,"JBD: updating superblock (start %u, seq %d, errno %d)\n", |
980 | journal->j_tail, journal->j_tail_sequence, journal->j_errno); | 980 | journal->j_tail, journal->j_tail_sequence, journal->j_errno); |
981 | 981 | ||
982 | sb->s_sequence = cpu_to_be32(journal->j_tail_sequence); | 982 | sb->s_sequence = cpu_to_be32(journal->j_tail_sequence); |
@@ -1371,7 +1371,7 @@ int journal_flush(journal_t *journal) | |||
1371 | { | 1371 | { |
1372 | int err = 0; | 1372 | int err = 0; |
1373 | transaction_t *transaction = NULL; | 1373 | transaction_t *transaction = NULL; |
1374 | unsigned long old_tail; | 1374 | unsigned int old_tail; |
1375 | 1375 | ||
1376 | spin_lock(&journal->j_state_lock); | 1376 | spin_lock(&journal->j_state_lock); |
1377 | 1377 | ||
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) | |||
70 | { | 70 | { |
71 | int err; | 71 | int err; |
72 | unsigned int max, nbufs, next; | 72 | unsigned int max, nbufs, next; |
73 | unsigned long blocknr; | 73 | unsigned int blocknr; |
74 | struct buffer_head *bh; | 74 | struct buffer_head *bh; |
75 | 75 | ||
76 | struct buffer_head * bufs[MAXBUF]; | 76 | struct buffer_head * bufs[MAXBUF]; |
@@ -132,7 +132,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal, | |||
132 | unsigned int offset) | 132 | unsigned int offset) |
133 | { | 133 | { |
134 | int err; | 134 | int err; |
135 | unsigned long blocknr; | 135 | unsigned int blocknr; |
136 | struct buffer_head *bh; | 136 | struct buffer_head *bh; |
137 | 137 | ||
138 | *bhp = NULL; | 138 | *bhp = NULL; |
@@ -314,7 +314,7 @@ static int do_one_pass(journal_t *journal, | |||
314 | struct recovery_info *info, enum passtype pass) | 314 | struct recovery_info *info, enum passtype pass) |
315 | { | 315 | { |
316 | unsigned int first_commit_ID, next_commit_ID; | 316 | unsigned int first_commit_ID, next_commit_ID; |
317 | unsigned long next_log_block; | 317 | unsigned int next_log_block; |
318 | int err, success = 0; | 318 | int err, success = 0; |
319 | journal_superblock_t * sb; | 319 | journal_superblock_t * sb; |
320 | journal_header_t * tmp; | 320 | journal_header_t * tmp; |
@@ -367,14 +367,14 @@ static int do_one_pass(journal_t *journal, | |||
367 | if (tid_geq(next_commit_ID, info->end_transaction)) | 367 | if (tid_geq(next_commit_ID, info->end_transaction)) |
368 | break; | 368 | break; |
369 | 369 | ||
370 | jbd_debug(2, "Scanning for sequence ID %u at %lu/%lu\n", | 370 | jbd_debug(2, "Scanning for sequence ID %u at %u/%u\n", |
371 | next_commit_ID, next_log_block, journal->j_last); | 371 | next_commit_ID, next_log_block, journal->j_last); |
372 | 372 | ||
373 | /* Skip over each chunk of the transaction looking | 373 | /* Skip over each chunk of the transaction looking |
374 | * either the next descriptor block or the final commit | 374 | * either the next descriptor block or the final commit |
375 | * record. */ | 375 | * record. */ |
376 | 376 | ||
377 | jbd_debug(3, "JBD: checking block %ld\n", next_log_block); | 377 | jbd_debug(3, "JBD: checking block %u\n", next_log_block); |
378 | err = jread(&bh, journal, next_log_block); | 378 | err = jread(&bh, journal, next_log_block); |
379 | if (err) | 379 | if (err) |
380 | goto failed; | 380 | goto failed; |
@@ -429,7 +429,7 @@ static int do_one_pass(journal_t *journal, | |||
429 | tagp = &bh->b_data[sizeof(journal_header_t)]; | 429 | tagp = &bh->b_data[sizeof(journal_header_t)]; |
430 | while ((tagp - bh->b_data +sizeof(journal_block_tag_t)) | 430 | while ((tagp - bh->b_data +sizeof(journal_block_tag_t)) |
431 | <= journal->j_blocksize) { | 431 | <= journal->j_blocksize) { |
432 | unsigned long io_block; | 432 | unsigned int io_block; |
433 | 433 | ||
434 | tag = (journal_block_tag_t *) tagp; | 434 | tag = (journal_block_tag_t *) tagp; |
435 | flags = be32_to_cpu(tag->t_flags); | 435 | flags = be32_to_cpu(tag->t_flags); |
@@ -443,10 +443,10 @@ static int do_one_pass(journal_t *journal, | |||
443 | success = err; | 443 | success = err; |
444 | printk (KERN_ERR | 444 | printk (KERN_ERR |
445 | "JBD: IO error %d recovering " | 445 | "JBD: IO error %d recovering " |
446 | "block %ld in log\n", | 446 | "block %u in log\n", |
447 | err, io_block); | 447 | err, io_block); |
448 | } else { | 448 | } else { |
449 | unsigned long blocknr; | 449 | unsigned int blocknr; |
450 | 450 | ||
451 | J_ASSERT(obh != NULL); | 451 | J_ASSERT(obh != NULL); |
452 | blocknr = be32_to_cpu(tag->t_blocknr); | 452 | blocknr = be32_to_cpu(tag->t_blocknr); |
@@ -581,7 +581,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, | |||
581 | max = be32_to_cpu(header->r_count); | 581 | max = be32_to_cpu(header->r_count); |
582 | 582 | ||
583 | while (offset < max) { | 583 | while (offset < max) { |
584 | unsigned long blocknr; | 584 | unsigned int blocknr; |
585 | int err; | 585 | int err; |
586 | 586 | ||
587 | blocknr = be32_to_cpu(* ((__be32 *) (bh->b_data+offset))); | 587 | blocknr = be32_to_cpu(* ((__be32 *) (bh->b_data+offset))); |
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index da6cd9bdaabc..ad717328343a 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c | |||
@@ -101,7 +101,7 @@ struct jbd_revoke_record_s | |||
101 | { | 101 | { |
102 | struct list_head hash; | 102 | struct list_head hash; |
103 | tid_t sequence; /* Used for recovery only */ | 103 | tid_t sequence; /* Used for recovery only */ |
104 | unsigned long blocknr; | 104 | unsigned int blocknr; |
105 | }; | 105 | }; |
106 | 106 | ||
107 | 107 | ||
@@ -126,7 +126,7 @@ static void flush_descriptor(journal_t *, struct journal_head *, int, int); | |||
126 | /* Utility functions to maintain the revoke table */ | 126 | /* Utility functions to maintain the revoke table */ |
127 | 127 | ||
128 | /* Borrowed from buffer.c: this is a tried and tested block hash function */ | 128 | /* Borrowed from buffer.c: this is a tried and tested block hash function */ |
129 | static inline int hash(journal_t *journal, unsigned long block) | 129 | static inline int hash(journal_t *journal, unsigned int block) |
130 | { | 130 | { |
131 | struct jbd_revoke_table_s *table = journal->j_revoke; | 131 | struct jbd_revoke_table_s *table = journal->j_revoke; |
132 | int hash_shift = table->hash_shift; | 132 | int hash_shift = table->hash_shift; |
@@ -136,7 +136,7 @@ static inline int hash(journal_t *journal, unsigned long block) | |||
136 | (block << (hash_shift - 12))) & (table->hash_size - 1); | 136 | (block << (hash_shift - 12))) & (table->hash_size - 1); |
137 | } | 137 | } |
138 | 138 | ||
139 | static int insert_revoke_hash(journal_t *journal, unsigned long blocknr, | 139 | static int insert_revoke_hash(journal_t *journal, unsigned int blocknr, |
140 | tid_t seq) | 140 | tid_t seq) |
141 | { | 141 | { |
142 | struct list_head *hash_list; | 142 | struct list_head *hash_list; |
@@ -166,7 +166,7 @@ oom: | |||
166 | /* Find a revoke record in the journal's hash table. */ | 166 | /* Find a revoke record in the journal's hash table. */ |
167 | 167 | ||
168 | static struct jbd_revoke_record_s *find_revoke_record(journal_t *journal, | 168 | static struct jbd_revoke_record_s *find_revoke_record(journal_t *journal, |
169 | unsigned long blocknr) | 169 | unsigned int blocknr) |
170 | { | 170 | { |
171 | struct list_head *hash_list; | 171 | struct list_head *hash_list; |
172 | struct jbd_revoke_record_s *record; | 172 | struct jbd_revoke_record_s *record; |
@@ -332,7 +332,7 @@ void journal_destroy_revoke(journal_t *journal) | |||
332 | * by one. | 332 | * by one. |
333 | */ | 333 | */ |
334 | 334 | ||
335 | int journal_revoke(handle_t *handle, unsigned long blocknr, | 335 | int journal_revoke(handle_t *handle, unsigned int blocknr, |
336 | struct buffer_head *bh_in) | 336 | struct buffer_head *bh_in) |
337 | { | 337 | { |
338 | struct buffer_head *bh = NULL; | 338 | struct buffer_head *bh = NULL; |
@@ -401,7 +401,7 @@ int journal_revoke(handle_t *handle, unsigned long blocknr, | |||
401 | } | 401 | } |
402 | } | 402 | } |
403 | 403 | ||
404 | jbd_debug(2, "insert revoke for block %lu, bh_in=%p\n", blocknr, bh_in); | 404 | jbd_debug(2, "insert revoke for block %u, bh_in=%p\n", blocknr, bh_in); |
405 | err = insert_revoke_hash(journal, blocknr, | 405 | err = insert_revoke_hash(journal, blocknr, |
406 | handle->h_transaction->t_tid); | 406 | handle->h_transaction->t_tid); |
407 | BUFFER_TRACE(bh_in, "exit"); | 407 | BUFFER_TRACE(bh_in, "exit"); |
@@ -644,7 +644,7 @@ static void flush_descriptor(journal_t *journal, | |||
644 | */ | 644 | */ |
645 | 645 | ||
646 | int journal_set_revoke(journal_t *journal, | 646 | int journal_set_revoke(journal_t *journal, |
647 | unsigned long blocknr, | 647 | unsigned int blocknr, |
648 | tid_t sequence) | 648 | tid_t sequence) |
649 | { | 649 | { |
650 | struct jbd_revoke_record_s *record; | 650 | struct jbd_revoke_record_s *record; |
@@ -668,7 +668,7 @@ int journal_set_revoke(journal_t *journal, | |||
668 | */ | 668 | */ |
669 | 669 | ||
670 | int journal_test_revoke(journal_t *journal, | 670 | int journal_test_revoke(journal_t *journal, |
671 | unsigned long blocknr, | 671 | unsigned int blocknr, |
672 | tid_t sequence) | 672 | tid_t sequence) |
673 | { | 673 | { |
674 | struct jbd_revoke_record_s *record; | 674 | struct jbd_revoke_record_s *record; |