diff options
Diffstat (limited to 'fs/jbd2/recovery.c')
-rw-r--r-- | fs/jbd2/recovery.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 52054a83e717..9f10acafaf70 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/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 | sector_t blocknr; | 73 | unsigned long long 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 | sector_t blocknr; | 135 | unsigned long long blocknr; |
136 | struct buffer_head *bh; | 136 | struct buffer_head *bh; |
137 | 137 | ||
138 | *bhp = NULL; | 138 | *bhp = NULL; |
@@ -308,9 +308,9 @@ int jbd2_journal_skip_recovery(journal_t *journal) | |||
308 | return err; | 308 | return err; |
309 | } | 309 | } |
310 | 310 | ||
311 | static inline sector_t read_tag_block(int tag_bytes, journal_block_tag_t *tag) | 311 | static inline unsigned long long read_tag_block(int tag_bytes, journal_block_tag_t *tag) |
312 | { | 312 | { |
313 | sector_t block = be32_to_cpu(tag->t_blocknr); | 313 | unsigned long long block = be32_to_cpu(tag->t_blocknr); |
314 | if (tag_bytes > JBD_TAG_SIZE32) | 314 | if (tag_bytes > JBD_TAG_SIZE32) |
315 | block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32; | 315 | block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32; |
316 | return block; | 316 | return block; |
@@ -452,7 +452,7 @@ static int do_one_pass(journal_t *journal, | |||
452 | "block %ld in log\n", | 452 | "block %ld in log\n", |
453 | err, io_block); | 453 | err, io_block); |
454 | } else { | 454 | } else { |
455 | sector_t blocknr; | 455 | unsigned long long blocknr; |
456 | 456 | ||
457 | J_ASSERT(obh != NULL); | 457 | J_ASSERT(obh != NULL); |
458 | blocknr = read_tag_block(tag_bytes, | 458 | blocknr = read_tag_block(tag_bytes, |
@@ -592,7 +592,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, | |||
592 | record_len = 8; | 592 | record_len = 8; |
593 | 593 | ||
594 | while (offset + record_len <= max) { | 594 | while (offset + record_len <= max) { |
595 | sector_t blocknr; | 595 | unsigned long long blocknr; |
596 | int err; | 596 | int err; |
597 | 597 | ||
598 | if (record_len == 4) | 598 | if (record_len == 4) |