Updated patch a) ext4-cleanup-2.patch sparse fixes for unlock error. b) add ext4-Return-after-ext4_error-in-case-of-failures.patch c) add mballoc-compilebench-fix.patch patches are attached. New patches are added towards the end. series ..... ext4-cleanup-2.patch ext4-cleanup-3.patch ext4-cleanup-4.patch 48-bit-i_blocks.patch large-file.patch ext2_fix_max_size.patch ext3_fix_max_size.patch ext4_sync_group_desciptor_with_e2fsprogs.patch ext4-Return-after-ext4_error-in-case-of-failures.patch mballoc-compilebench-fix.patch putting the diff for easy review. -aneesh diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index e29306e..8e42546 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -234,11 +234,13 @@ read_block_bitmap(struct super_block *sb, ext4_grpnum_t block_group) } else { bh = sb_bread(sb, bitmap_blk); } - if (!bh) + if (!bh) { ext4_error (sb, __FUNCTION__, "Cannot read block bitmap - " "block_group = %lu, block_bitmap = %llu", block_group, bitmap_blk); + return NULL; + } /* check whether block bitmap block number is set */ if (!block_in_use(bitmap_blk, sb, bh->b_data)) { @@ -630,11 +632,13 @@ do_more: in_range(ext4_inode_bitmap(sb, desc), block, count) || in_range(block, ext4_inode_table(sb, desc), sbi->s_itb_per_group) || in_range(block + count - 1, ext4_inode_table(sb, desc), - sbi->s_itb_per_group)) + sbi->s_itb_per_group)) { ext4_error (sb, "ext4_free_blocks", "Freeing blocks in system zones - " "Block = %llu, count = %lu", block, count); + goto error_return; + } /* * We are about to start releasing blocks in the bitmap, @@ -1746,11 +1750,13 @@ allocated: in_range(ret_block, ext4_inode_table(sb, gdp), EXT4_SB(sb)->s_itb_per_group) || in_range(ret_block + num - 1, ext4_inode_table(sb, gdp), - EXT4_SB(sb)->s_itb_per_group)) + EXT4_SB(sb)->s_itb_per_group)) { ext4_error(sb, "ext4_new_block", "Allocating block in system zone - " "blocks from %llu, length %lu", ret_block, num); + goto out; + } performed_allocation = 1; diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index fe7cf9e..8467b3d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3089,13 +3089,14 @@ static void ext4_mb_normalize_request(struct ext4_allocation_context *ac, } } if (wind == 0) { + __u64 tstart; /* file is quite large, we now preallocate with * the biggest configured window with regart to * logical offset */ wind = sbi->s_mb_prealloc_table[i - 1]; - start = ac->ac_o_ex.fe_logical; - do_div(start, wind); - start = start * wind; + tstart = ac->ac_o_ex.fe_logical; + do_div(tstart, wind); + start = tstart * wind; } size = wind; orig_size = size; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 801c499..10feae6 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1713,6 +1713,9 @@ static ext4_fsblk_t descriptor_loc(struct super_block *sb, static int ext4_fill_super (struct super_block *sb, void *data, int silent) + __releases(kernel_sem) + __acquires(kernel_sem) + { struct buffer_head * bh; struct ext4_super_block *es = NULL;