diff options
Diffstat (limited to 'fs/jbd2/revoke.c')
-rw-r--r-- | fs/jbd2/revoke.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 3310a1d7ace9..380d19917f37 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c | |||
@@ -81,7 +81,7 @@ struct jbd2_revoke_record_s | |||
81 | { | 81 | { |
82 | struct list_head hash; | 82 | struct list_head hash; |
83 | tid_t sequence; /* Used for recovery only */ | 83 | tid_t sequence; /* Used for recovery only */ |
84 | sector_t blocknr; | 84 | unsigned long long blocknr; |
85 | }; | 85 | }; |
86 | 86 | ||
87 | 87 | ||
@@ -106,7 +106,7 @@ static void flush_descriptor(journal_t *, struct journal_head *, int); | |||
106 | /* Utility functions to maintain the revoke table */ | 106 | /* Utility functions to maintain the revoke table */ |
107 | 107 | ||
108 | /* Borrowed from buffer.c: this is a tried and tested block hash function */ | 108 | /* Borrowed from buffer.c: this is a tried and tested block hash function */ |
109 | static inline int hash(journal_t *journal, sector_t block) | 109 | static inline int hash(journal_t *journal, unsigned long long block) |
110 | { | 110 | { |
111 | struct jbd2_revoke_table_s *table = journal->j_revoke; | 111 | struct jbd2_revoke_table_s *table = journal->j_revoke; |
112 | int hash_shift = table->hash_shift; | 112 | int hash_shift = table->hash_shift; |
@@ -117,7 +117,7 @@ static inline int hash(journal_t *journal, sector_t block) | |||
117 | (hash << (hash_shift - 12))) & (table->hash_size - 1); | 117 | (hash << (hash_shift - 12))) & (table->hash_size - 1); |
118 | } | 118 | } |
119 | 119 | ||
120 | static int insert_revoke_hash(journal_t *journal, sector_t blocknr, | 120 | static int insert_revoke_hash(journal_t *journal, unsigned long long blocknr, |
121 | tid_t seq) | 121 | tid_t seq) |
122 | { | 122 | { |
123 | struct list_head *hash_list; | 123 | struct list_head *hash_list; |
@@ -147,7 +147,7 @@ oom: | |||
147 | /* Find a revoke record in the journal's hash table. */ | 147 | /* Find a revoke record in the journal's hash table. */ |
148 | 148 | ||
149 | static struct jbd2_revoke_record_s *find_revoke_record(journal_t *journal, | 149 | static struct jbd2_revoke_record_s *find_revoke_record(journal_t *journal, |
150 | sector_t blocknr) | 150 | unsigned long long blocknr) |
151 | { | 151 | { |
152 | struct list_head *hash_list; | 152 | struct list_head *hash_list; |
153 | struct jbd2_revoke_record_s *record; | 153 | struct jbd2_revoke_record_s *record; |
@@ -326,7 +326,7 @@ void jbd2_journal_destroy_revoke(journal_t *journal) | |||
326 | * by one. | 326 | * by one. |
327 | */ | 327 | */ |
328 | 328 | ||
329 | int jbd2_journal_revoke(handle_t *handle, sector_t blocknr, | 329 | int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, |
330 | struct buffer_head *bh_in) | 330 | struct buffer_head *bh_in) |
331 | { | 331 | { |
332 | struct buffer_head *bh = NULL; | 332 | struct buffer_head *bh = NULL; |
@@ -650,7 +650,7 @@ static void flush_descriptor(journal_t *journal, | |||
650 | */ | 650 | */ |
651 | 651 | ||
652 | int jbd2_journal_set_revoke(journal_t *journal, | 652 | int jbd2_journal_set_revoke(journal_t *journal, |
653 | sector_t blocknr, | 653 | unsigned long long blocknr, |
654 | tid_t sequence) | 654 | tid_t sequence) |
655 | { | 655 | { |
656 | struct jbd2_revoke_record_s *record; | 656 | struct jbd2_revoke_record_s *record; |
@@ -674,7 +674,7 @@ int jbd2_journal_set_revoke(journal_t *journal, | |||
674 | */ | 674 | */ |
675 | 675 | ||
676 | int jbd2_journal_test_revoke(journal_t *journal, | 676 | int jbd2_journal_test_revoke(journal_t *journal, |
677 | sector_t blocknr, | 677 | unsigned long long blocknr, |
678 | tid_t sequence) | 678 | tid_t sequence) |
679 | { | 679 | { |
680 | struct jbd2_revoke_record_s *record; | 680 | struct jbd2_revoke_record_s *record; |