aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2006-10-11 04:21:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 14:14:16 -0400
commit3a5b2ecdd1fa63a8f25bd769223bc1c2564ce45d (patch)
treedc80fdde9ed01e77ef0ed6fdef7573d303bd07db /fs/ext4/super.c
parenta86c61812637c7dd0c57e29880cffd477b62f2e7 (diff)
[PATCH] ext4: switch fsblk to sector_t
Redefine ext3 in-kernel filesystem block type (ext3_fsblk_t) from unsigned long to sector_t, to allow kernel to handle >32 bit ext3 blocks. 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/super.c')
-rw-r--r--fs/ext4/super.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 69f875250500..1d12e4f7d69f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1433,8 +1433,8 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1433 * block sizes. We need to calculate the offset from buffer start. 1433 * block sizes. We need to calculate the offset from buffer start.
1434 */ 1434 */
1435 if (blocksize != EXT4_MIN_BLOCK_SIZE) { 1435 if (blocksize != EXT4_MIN_BLOCK_SIZE) {
1436 logic_sb_block = (sb_block * EXT4_MIN_BLOCK_SIZE) / blocksize; 1436 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1437 offset = (sb_block * EXT4_MIN_BLOCK_SIZE) % blocksize; 1437 offset = sector_div(logic_sb_block, blocksize);
1438 } else { 1438 } else {
1439 logic_sb_block = sb_block; 1439 logic_sb_block = sb_block;
1440 } 1440 }
@@ -1539,8 +1539,8 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1539 1539
1540 brelse (bh); 1540 brelse (bh);
1541 sb_set_blocksize(sb, blocksize); 1541 sb_set_blocksize(sb, blocksize);
1542 logic_sb_block = (sb_block * EXT4_MIN_BLOCK_SIZE) / blocksize; 1542 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1543 offset = (sb_block * EXT4_MIN_BLOCK_SIZE) % blocksize; 1543 offset = sector_div(logic_sb_block, blocksize);
1544 bh = sb_bread(sb, logic_sb_block); 1544 bh = sb_bread(sb, logic_sb_block);
1545 if (!bh) { 1545 if (!bh) {
1546 printk(KERN_ERR 1546 printk(KERN_ERR