diff options
author | Mingming Cao <cmm@us.ibm.com> | 2006-10-11 04:21:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:18 -0400 |
commit | 2ae0210760aed9d626eaede5b63db95e198f7c8e (patch) | |
tree | 40fd1795f7d2b337407876d515a0147d72cea4f4 /fs/ext4/inode.c | |
parent | bd81d8eec043094d3ff729a8ff6d5b3a06d3c4b1 (diff) |
[PATCH] ext4: blk_type from sector_t to unsigned long long
Change ext4 in-kernel block type (ext4_fsblk_t) from sector_t to unsigned
long long. Remove ext4 block type string micro E3FSBLK, replaced with "%llu"
[akpm@osdl.org: build fix]
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/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index effc38afebe3..99b82b52b5f0 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2115,7 +2115,7 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode, | |||
2115 | */ | 2115 | */ |
2116 | if (!bh) { | 2116 | if (!bh) { |
2117 | ext4_error(inode->i_sb, "ext4_free_branches", | 2117 | ext4_error(inode->i_sb, "ext4_free_branches", |
2118 | "Read failure, inode=%lu, block="E3FSBLK, | 2118 | "Read failure, inode=%lu, block=%llu", |
2119 | inode->i_ino, nr); | 2119 | inode->i_ino, nr); |
2120 | continue; | 2120 | continue; |
2121 | } | 2121 | } |
@@ -2466,7 +2466,7 @@ static int __ext4_get_inode_loc(struct inode *inode, | |||
2466 | if (!bh) { | 2466 | if (!bh) { |
2467 | ext4_error (inode->i_sb, "ext4_get_inode_loc", | 2467 | ext4_error (inode->i_sb, "ext4_get_inode_loc", |
2468 | "unable to read inode block - " | 2468 | "unable to read inode block - " |
2469 | "inode=%lu, block="E3FSBLK, | 2469 | "inode=%lu, block=%llu", |
2470 | inode->i_ino, block); | 2470 | inode->i_ino, block); |
2471 | return -EIO; | 2471 | return -EIO; |
2472 | } | 2472 | } |
@@ -2548,7 +2548,7 @@ make_io: | |||
2548 | if (!buffer_uptodate(bh)) { | 2548 | if (!buffer_uptodate(bh)) { |
2549 | ext4_error(inode->i_sb, "ext4_get_inode_loc", | 2549 | ext4_error(inode->i_sb, "ext4_get_inode_loc", |
2550 | "unable to read inode block - " | 2550 | "unable to read inode block - " |
2551 | "inode=%lu, block="E3FSBLK, | 2551 | "inode=%lu, block=%llu", |
2552 | inode->i_ino, block); | 2552 | inode->i_ino, block); |
2553 | brelse(bh); | 2553 | brelse(bh); |
2554 | return -EIO; | 2554 | return -EIO; |