ext2 modify variables to exceed 2G
PATCH 11/24 ext2 modify variables to exceed 2G
Summary of this patch:
[11/24] change the type of variables manipulating a block or an
inode(ext2)
- Change the type of 4byte variables manipulating a block or an inode from signed to unsigned.
- Where an overflow occurs in process of operation, casting it to long long.
Signed-off-by Takashi Sato [email protected]
---
fs/ext2/balloc.c +8 -8
@@ -99,7 +99,7 @@ error_out:* Set sb->s_dirt here because the superblock was "logically" altered. We * need to recalculate its free blocks count and flush it out. */ -static int reserve_blocks (struct super_block *sb,int count) +static unsigned int reserve_blocks (struct super_block *sb,unsigned int count) {struct ext2_sb_info *sbi =EXT2_SB (sb);struct ext2_super_block *es = sbi->s_es;
@@ -130,7 +130,7 @@ static int reserve_blocks(struct super_breturn count; } -static void release_blocks (struct super_block *sb,int count) +static void release_blocks (struct super_block *sb,unsigned int count) {if (count) {struct ext2_sb_info *sbi =EXT2_SB (sb);
@@ -140,8 +140,8 @@ static void release_blocks(struct super_ } } -static int group_reserve_blocks (struct ext2_sb_info *sbi,int group_no, -struct ext2_group_desc *desc,struct buffer_head *bh,int count) +static unsigned int group_reserve_blocks (struct ext2_sb_info *sbi,int group_no, +struct ext2_group_desc *desc,struct buffer_head *bh,unsigned int count) {unsigned free_blocks;
@@ -159,7 +159,7 @@ static int group_reserve_blocks(struct e }static void group_release_blocks (struct super_block *sb,int group_no, -struct ext2_group_desc *desc,struct buffer_head *bh,int count) +struct ext2_group_desc *desc,struct buffer_head *bh,unsigned int count) {if (count) {struct ext2_sb_info *sbi =EXT2_SB (sb);
@@ -324,7 +324,7 @@ got_it:* bitmap, and then for any free bit if that fails. * This function also updates quota and i_blocks field. */ -int ext2_new_block (struct inode *inode,unsigned long goal, +unsigned int ext2_new_block (struct inode *inode,unsigned long goal,u32 *prealloc_count,u32 *prealloc_block,int *err) {struct buffer_head *bitmap_bh =NULL ;
@@ -333,8 +333,8 @@ int ext2_new_block(struct inode *inode,int group_no;/* i */ int ret_block;/* j */ int group_idx;/* k */ -int target_block;/* tmp */ -int block =0 ; +unsigned int target_block;/* tmp */ +unsigned int block =0 ;struct super_block *sb = inode->i_sb;struct ext2_sb_info *sbi =EXT2_SB (sb);struct ext2_super_block *es = sbi->s_es;
fs/ext2/ext2.h +1 -1
@@ -91,7 +91,7 @@ static inline struct ext2_inode_info *EX/* balloc.c */ extern int ext2_bg_has_super (struct super_block *sb,int group);extern unsigned long ext2_bg_num_gdb (struct super_block *sb,int group); -extern int ext2_new_block (struct inode *,unsigned long , +extern unsigned int ext2_new_block (struct inode *,unsigned long ,__u32 *,__u32 *,int *);extern void ext2_free_blocks (struct inode *,unsigned long ,unsigned long );
fs/ext2/ialloc.c +1 -3
@@ -276,12 +276,10 @@ static int find_group_orlov(struct superstruct ext2_super_block *es = sbi->s_es;int ngroups = sbi->s_groups_count;int inodes_per_group =EXT2_INODES_PER_GROUP (sb); -int freei; +unsigned long freei, free_blocks, ndirs;int avefreei; -int free_blocks;int avefreeb;int blocks_per_dir; -int ndirs;int max_debt, max_dirs, min_blocks, min_inodes;int group =-1 , i;struct ext2_group_desc *desc;
fs/ext2/inode.c +7 -7
@@ -107,7 +107,7 @@ void ext2_discard_prealloc (struct inode#endif } -static int ext2_alloc_block (struct inode * inode,unsigned long goal,int *err) +static unsigned int ext2_alloc_block (struct inode * inode,unsigned long goal,int *err) {#ifdef EXT2FS_DEBUG static unsigned long alloc_hits, alloc_attempts;
@@ -194,7 +194,7 @@ static inline int verify_chain(Indirect*/ static int ext2_block_to_path (struct inode *inode, -long i_block,int offsets[4 ],int *boundary) +unsigned long i_block,int offsets[4 ],int *boundary) {int ptrs =EXT2_ADDR_PER_BLOCK (inode->i_sb);int ptrs_bits =EXT2_ADDR_PER_BLOCK_BITS (inode->i_sb);
@@ -363,7 +363,7 @@ static unsigned long ext2_find_near(stru*/ static inline int ext2_find_goal (struct inode *inode, -long block, +unsigned long block,Indirect chain[4 ],Indirect *partial,unsigned long *goal)
@@ -425,13 +425,13 @@ static int ext2_alloc_branch(struct inodint n =0 ;int err;int i; -int parent =ext2_alloc_block (inode, goal, &err); +unsigned int parent =ext2_alloc_block (inode, goal, &err); branch[0 ].key =cpu_to_le32 (parent);if (parent)for (n =1 ; n < num; n++) {struct buffer_head *bh;/* Allocate the next block */ -int nr =ext2_alloc_block (inode, parent, &err); +unsigned int nr =ext2_alloc_block (inode, parent, &err);if (!nr)break ; branch[n].key =cpu_to_le32 (nr);
@@ -489,7 +489,7 @@ static int ext2_alloc_branch(struct inod*/ static inline int ext2_splice_branch (struct inode *inode, -long block, +unsigned long block,Indirect chain[4 ],Indirect *where,int num)
@@ -905,7 +905,7 @@ void ext2_truncate (struct inode * inodeIndirect *partial;__le32 nr =0 ;int n; -long iblock; +unsigned long iblock;unsigned blocksize; if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
fs/ext2/super.c +10 -7
@@ -31,6 +31,7 @@#include <linux/seq_file.h> #include <linux/mount.h> #include <asm/uaccess.h> +#include <asm/div64.h> #include "ext2.h" #include "xattr.h" #include "acl.h"
@@ -516,7 +517,7 @@ static int ext2_check_descriptors (strucif ((i %EXT2_DESC_PER_BLOCK (sb)) ==0 ) gdp = (struct ext2_group_desc *) sbi->s_group_desc[desc_block++]->b_data;if (le32_to_cpu (gdp->bg_block_bitmap) < block || -le32_to_cpu (gdp->bg_block_bitmap) >= block +EXT2_BLOCKS_PER_GROUP (sb)) +le32_to_cpu (gdp->bg_block_bitmap) >= (unsigned long long )block +EXT2_BLOCKS_PER_GROUP (sb)) {ext2_error (sb,"ext2_check_descriptors" , "Block bitmap for group %d"
@@ -525,7 +526,7 @@ static int ext2_check_descriptors (strucreturn 0 ; }if (le32_to_cpu (gdp->bg_inode_bitmap) < block || -le32_to_cpu (gdp->bg_inode_bitmap) >= block +EXT2_BLOCKS_PER_GROUP (sb)) +le32_to_cpu (gdp->bg_inode_bitmap) >= (unsigned long long )block +EXT2_BLOCKS_PER_GROUP (sb)) {ext2_error (sb,"ext2_check_descriptors" , "Inode bitmap for group %d"
@@ -535,7 +536,7 @@ static int ext2_check_descriptors (struc }if (le32_to_cpu (gdp->bg_inode_table) < block ||le32_to_cpu (gdp->bg_inode_table) + sbi->s_itb_per_group >= - block +EXT2_BLOCKS_PER_GROUP (sb)) + (unsigned long long )block +EXT2_BLOCKS_PER_GROUP (sb)) {ext2_error (sb,"ext2_check_descriptors" , "Inode table for group %d"
@@ -609,6 +610,7 @@ static int ext2_fill_super(struct super_int db_count;int i, j;__le32 features; +unsigned long long tmp_blocks; sbi =kmalloc (sizeof (*sbi),GFP_KERNEL );if (!sbi)
@@ -823,10 +825,11 @@ static int ext2_fill_super(struct super_if (EXT2_BLOCKS_PER_GROUP (sb) ==0 ) goto cantfind_ext2; - sbi->s_groups_count = (le32_to_cpu (es->s_blocks_count) - -le32_to_cpu (es->s_first_data_block) + -EXT2_BLOCKS_PER_GROUP (sb) -1 ) / -EXT2_BLOCKS_PER_GROUP (sb); + tmp_blocks = (le32_to_cpu (es->s_blocks_count) - +le32_to_cpu (es->s_first_data_block) + + (unsigned long long )EXT2_BLOCKS_PER_GROUP (sb) -1 ); +do_div (tmp_blocks,EXT2_BLOCKS_PER_GROUP (sb)); + sbi->s_groups_count = tmp_blocks; db_count = (sbi->s_groups_count +EXT2_DESC_PER_BLOCK (sb) -1 ) /EXT2_DESC_PER_BLOCK (sb); sbi->s_group_desc =kmalloc (db_count *sizeof (struct buffer_head *),GFP_KERNEL );
fs/ext2/xattr.c +2 -2
@@ -664,11 +664,11 @@ ext2_xattr_set2(struct inode *inode, strext2_xattr_cache_insert (new_bh); }else {/* We need to allocate a new block */ -int goal =le32_to_cpu (EXT2_SB (sb)->s_es-> +unsigned int goal =le32_to_cpu (EXT2_SB (sb)->s_es-> s_first_data_block) +EXT2_I (inode)->i_block_group *EXT2_BLOCKS_PER_GROUP (sb); -int block =ext2_new_block (inode, goal, +unsigned int block =ext2_new_block (inode, goal,NULL ,NULL , &error);if (error) goto cleanup;
fs/ext2/xip.c +2 -2
@@ -44,8 +44,8 @@ __ext2_get_sector(struct inode *inode, sreturn rc; } -int -ext2_clear_xip_target (struct inode *inode,int block) +unsigned int +ext2_clear_xip_target (struct inode *inode,unsigned int block) {sector_t sector = block * (PAGE_SIZE /512 );unsigned long data;