On Sun, 2008-02-17 at 15:08 +0900, Akinobu Mita wrote:
> Use ext4_group_first_block_no() and assign the return values to
> ext2_fsblk_t variables.
>
Acked for ext2/3/4 patches(except a little typo in above change log:
ext4_fsblk_t). ext4 patch is queued in ext4 patch queue
http://repo.or.cz/w/ext4-patch-queue.git
Mingming
> Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
> Cc: Stephen Tweedie <[EMAIL PROTECTED]>
> Cc: [EMAIL PROTECTED]
> Cc: Andrew Morton <[EMAIL PROTECTED]>
> Cc: Mingming Cao <[EMAIL PROTECTED]>
> Cc: Theodore Tso <[EMAIL PROTECTED]>
> ---
> fs/ext4/balloc.c | 6 +++---
> fs/ext4/xattr.c | 6 ++----
> 2 files changed, 5 insertions(+), 7 deletions(-)
>
> Index: 2.6-rc/fs/ext4/xattr.c
> ===================================================================
> --- 2.6-rc.orig/fs/ext4/xattr.c
> +++ 2.6-rc/fs/ext4/xattr.c
> @@ -808,10 +808,8 @@ inserted:
> get_bh(new_bh);
> } else {
> /* We need to allocate a new block */
> - ext4_fsblk_t goal = le32_to_cpu(
> - EXT4_SB(sb)->s_es->s_first_data_block) +
> - (ext4_fsblk_t)EXT4_I(inode)->i_block_group *
> - EXT4_BLOCKS_PER_GROUP(sb);
> + ext4_fsblk_t goal = ext4_group_first_block_no(sb,
> + EXT4_I(inode)->i_block_group);
> ext4_fsblk_t block = ext4_new_block(handle, inode,
> goal, &error);
> if (error)
> Index: 2.6-rc/fs/ext4/balloc.c
> ===================================================================
> --- 2.6-rc.orig/fs/ext4/balloc.c
> +++ 2.6-rc/fs/ext4/balloc.c
> @@ -48,7 +48,6 @@ void ext4_get_group_no_and_offset(struct
> unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head
> *bh,
> ext4_group_t block_group, struct ext4_group_desc *gdp)
> {
> - unsigned long start;
> int bit, bit_max;
> unsigned free_blocks, group_blocks;
> struct ext4_sb_info *sbi = EXT4_SB(sb);
> @@ -106,11 +105,12 @@ unsigned ext4_init_block_bitmap(struct s
> free_blocks = group_blocks - bit_max;
>
> if (bh) {
> + ext4_fsblk_t start;
> +
> for (bit = 0; bit < bit_max; bit++)
> ext4_set_bit(bit, bh->b_data);
>
> - start = block_group * EXT4_BLOCKS_PER_GROUP(sb) +
> - le32_to_cpu(sbi->s_es->s_first_data_block);
> + start = ext4_group_first_block_no(sb, block_group);
>
> /* Set bits for block and inode bitmaps, and inode table */
> ext4_set_bit(ext4_block_bitmap(sb, gdp) - start, bh->b_data);
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
