aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-10-11 04:21:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 14:14:18 -0400
commitf4e5bc244f23ee024a4dfa034b591b219b2bfb8f (patch)
treedf0cb1469de20ae9706a671ab8e9b049e1d93f63 /fs/ext4/super.c
parent72b64b594081ef0a0717f6aad77e891c72ed4afa (diff)
[PATCH] ext4 64 bit divide fix
With CONFIG_LBD=n, sector_div() expands to a plain old divide. But ext4 is _not_ passing in a sector_t as the first argument, so... fs/built-in.o: In function `ext4_get_group_no_and_offset': fs/ext4/balloc.c:39: undefined reference to `__umoddi3' fs/ext4/balloc.c:41: undefined reference to `__udivdi3' fs/built-in.o: In function `find_group_orlov': fs/ext4/ialloc.c:278: undefined reference to `__udivdi3' fs/built-in.o: In function `ext4_fill_super': fs/ext4/super.c:1488: undefined reference to `__udivdi3' fs/ext4/super.c:1488: undefined reference to `__umoddi3' fs/ext4/super.c:1594: undefined reference to `__udivdi3' fs/ext4/super.c:1601: undefined reference to `__umoddi3' Fix that up by calling do_div() directly. Also cast the arg to u64. do_div() is only defined on u64, and ext4_fsblk_t is supposed to be opaque. Note especially the changes to find_group_orlov(). It was attempting to do do_div(int, unsigned long long); which is royally screwed up. Switched it to plain old divide. Cc: <linux-ext4@vger.kernel.org> 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 811011fc5c94..f7ea0224f535 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1485,7 +1485,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1485 */ 1485 */
1486 if (blocksize != EXT4_MIN_BLOCK_SIZE) { 1486 if (blocksize != EXT4_MIN_BLOCK_SIZE) {
1487 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE; 1487 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1488 offset = sector_div(logic_sb_block, blocksize); 1488 offset = do_div(logic_sb_block, blocksize);
1489 } else { 1489 } else {
1490 logic_sb_block = sb_block; 1490 logic_sb_block = sb_block;
1491 } 1491 }
@@ -1591,7 +1591,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1591 brelse (bh); 1591 brelse (bh);
1592 sb_set_blocksize(sb, blocksize); 1592 sb_set_blocksize(sb, blocksize);
1593 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE; 1593 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1594 offset = sector_div(logic_sb_block, blocksize); 1594 offset = do_div(logic_sb_block, blocksize);
1595 bh = sb_bread(sb, logic_sb_block); 1595 bh = sb_bread(sb, logic_sb_block);
1596 if (!bh) { 1596 if (!bh) {
1597 printk(KERN_ERR 1597 printk(KERN_ERR