summaryrefslogtreecommitdiffstats
path: root/fs/jbd2/recovery.c
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2006-10-11 01:21:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:14:17 -0700
commit299717696d48531d70aeb4614c3939e4a28456c1 (patch)
treed63c05b0192e480917c48126b2ac7c0f74d08018 /fs/jbd2/recovery.c
parentb517bea1c74e4773482b3f41b3f493522a8c8e30 (diff)
downloadlinux-stable-299717696d48531d70aeb4614c3939e4a28456c1.tar.gz
linux-stable-299717696d48531d70aeb4614c3939e4a28456c1.tar.bz2
linux-stable-299717696d48531d70aeb4614c3939e4a28456c1.zip
[PATCH] jbd2: sector_t conversion
JBD layer in-kernel block varibles type fixes to support >32 bit block number and convert to sector_t type. 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 'fs/jbd2/recovery.c')
-rw-r--r--fs/jbd2/recovery.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index 2486843adda0..52054a83e717 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)
{
int err;
unsigned int max, nbufs, next;
- unsigned long blocknr;
+ sector_t 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;
+ sector_t blocknr;
struct buffer_head *bh;
*bhp = NULL;
@@ -452,7 +452,7 @@ static int do_one_pass(journal_t *journal,
"block %ld in log\n",
err, io_block);
} else {
- unsigned long blocknr;
+ sector_t blocknr;
J_ASSERT(obh != NULL);
blocknr = read_tag_block(tag_bytes,
@@ -592,7 +592,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,
record_len = 8;
while (offset + record_len <= max) {
- unsigned long blocknr;
+ sector_t blocknr;
int err;
if (record_len == 4)