diff options
author | Mingming Cao <cmm@us.ibm.com> | 2006-10-11 04:21:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:18 -0400 |
commit | 18eba7aae080d4a5c0d850ea810e83d11f0a8d77 (patch) | |
tree | 58277e871787fad73c588b3ba81899f9c8b98553 /include/linux | |
parent | 9b8f1f0106ab39ad58765d4e7c57189835f51127 (diff) |
[PATCH] jbd2: switch blks_type from sector_t to ull
Similar to ext4, change blocks in JBD2 from sector_t to unsigned long long.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/jbd2.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 3c939c844a7d..ddb128795781 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
@@ -741,7 +741,7 @@ struct journal_s | |||
741 | */ | 741 | */ |
742 | struct block_device *j_dev; | 742 | struct block_device *j_dev; |
743 | int j_blocksize; | 743 | int j_blocksize; |
744 | sector_t j_blk_offset; | 744 | unsigned long long j_blk_offset; |
745 | 745 | ||
746 | /* | 746 | /* |
747 | * Device which holds the client fs. For internal journal this will be | 747 | * Device which holds the client fs. For internal journal this will be |
@@ -860,7 +860,7 @@ extern void __journal_clean_data_list(transaction_t *transaction); | |||
860 | 860 | ||
861 | /* Log buffer allocation */ | 861 | /* Log buffer allocation */ |
862 | extern struct journal_head * jbd2_journal_get_descriptor_buffer(journal_t *); | 862 | extern struct journal_head * jbd2_journal_get_descriptor_buffer(journal_t *); |
863 | int jbd2_journal_next_log_block(journal_t *, sector_t *); | 863 | int jbd2_journal_next_log_block(journal_t *, unsigned long long *); |
864 | 864 | ||
865 | /* Commit management */ | 865 | /* Commit management */ |
866 | extern void jbd2_journal_commit_transaction(journal_t *); | 866 | extern void jbd2_journal_commit_transaction(journal_t *); |
@@ -875,7 +875,7 @@ extern int | |||
875 | jbd2_journal_write_metadata_buffer(transaction_t *transaction, | 875 | jbd2_journal_write_metadata_buffer(transaction_t *transaction, |
876 | struct journal_head *jh_in, | 876 | struct journal_head *jh_in, |
877 | struct journal_head **jh_out, | 877 | struct journal_head **jh_out, |
878 | sector_t blocknr); | 878 | unsigned long long blocknr); |
879 | 879 | ||
880 | /* Transaction locking */ | 880 | /* Transaction locking */ |
881 | extern void __wait_on_journal (journal_t *); | 881 | extern void __wait_on_journal (journal_t *); |
@@ -923,7 +923,7 @@ extern void jbd2_journal_unlock_updates (journal_t *); | |||
923 | 923 | ||
924 | extern journal_t * jbd2_journal_init_dev(struct block_device *bdev, | 924 | extern journal_t * jbd2_journal_init_dev(struct block_device *bdev, |
925 | struct block_device *fs_dev, | 925 | struct block_device *fs_dev, |
926 | sector_t start, int len, int bsize); | 926 | unsigned long long start, int len, int bsize); |
927 | extern journal_t * jbd2_journal_init_inode (struct inode *); | 927 | extern journal_t * jbd2_journal_init_inode (struct inode *); |
928 | extern int jbd2_journal_update_format (journal_t *); | 928 | extern int jbd2_journal_update_format (journal_t *); |
929 | extern int jbd2_journal_check_used_features | 929 | extern int jbd2_journal_check_used_features |
@@ -944,7 +944,7 @@ extern void jbd2_journal_abort (journal_t *, int); | |||
944 | extern int jbd2_journal_errno (journal_t *); | 944 | extern int jbd2_journal_errno (journal_t *); |
945 | extern void jbd2_journal_ack_err (journal_t *); | 945 | extern void jbd2_journal_ack_err (journal_t *); |
946 | extern int jbd2_journal_clear_err (journal_t *); | 946 | extern int jbd2_journal_clear_err (journal_t *); |
947 | extern int jbd2_journal_bmap(journal_t *, unsigned long, sector_t *); | 947 | extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *); |
948 | extern int jbd2_journal_force_commit(journal_t *); | 948 | extern int jbd2_journal_force_commit(journal_t *); |
949 | 949 | ||
950 | /* | 950 | /* |
@@ -977,13 +977,13 @@ extern void jbd2_journal_destroy_revoke_caches(void); | |||
977 | extern int jbd2_journal_init_revoke_caches(void); | 977 | extern int jbd2_journal_init_revoke_caches(void); |
978 | 978 | ||
979 | extern void jbd2_journal_destroy_revoke(journal_t *); | 979 | extern void jbd2_journal_destroy_revoke(journal_t *); |
980 | extern int jbd2_journal_revoke (handle_t *, sector_t, struct buffer_head *); | 980 | extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *); |
981 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); | 981 | extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *); |
982 | extern void jbd2_journal_write_revoke_records(journal_t *, transaction_t *); | 982 | extern void jbd2_journal_write_revoke_records(journal_t *, transaction_t *); |
983 | 983 | ||
984 | /* Recovery revoke support */ | 984 | /* Recovery revoke support */ |
985 | extern int jbd2_journal_set_revoke(journal_t *, sector_t, tid_t); | 985 | extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); |
986 | extern int jbd2_journal_test_revoke(journal_t *, sector_t, tid_t); | 986 | extern int jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t); |
987 | extern void jbd2_journal_clear_revoke(journal_t *); | 987 | extern void jbd2_journal_clear_revoke(journal_t *); |
988 | extern void jbd2_journal_switch_revoke_table(journal_t *journal); | 988 | extern void jbd2_journal_switch_revoke_table(journal_t *journal); |
989 | 989 | ||