Re: [RFC][PATCH 2/2] convert alloc.c to use blk64_t

["Jose R. Santos" <jrs@us.ibm.com>]

On Fri, 11 Apr 2008 11:36:16 -0400
Josef Bacik <jbacik@redhat.com> wrote:

> Hello,
> 
> 
> commit 0b80dee54f94f13210ae87a504e3b49d3dc284d4
> Author: Josef Bacik <jbacik@redhat.com>
> Date:   Fri Apr 11 18:23:13 2008 -0400
> 
>     Convert the block alloc functions to be 64bit capable.
>     
>     Signed-off-by: Josef Bacik <jbacik@redhat.com>
> 
> diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c
> index 65f3ea1..6924457 100644
> --- a/lib/ext2fs/alloc.c
> +++ b/lib/ext2fs/alloc.c
> @@ -73,10 +73,10 @@ errcode_t ext2fs_new_inode(ext2_filsys fs, ext2_ino_t dir,
>   * Stupid algorithm --- we now just search forward starting from the
>   * goal.  Should put in a smarter one someday....
>   */
> -errcode_t ext2fs_new_block(ext2_filsys fs, blk_t goal,
> -			   ext2fs_block_bitmap map, blk_t *ret)
> +errcode_t ext2fs_new_block64(ext2_filsys fs, blk64_t goal,
> +			     ext2fs_block_bitmap map, blk64_t *ret)

This should be ext2fs_new_blocks2() to make it easier to expand the API
in the future.  Using ext2fs_new_block64_2() just looks weird if we
ever needed to change the ABI requiring a new call.

> diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
> index a60e28b..058dea7 100644
> --- a/lib/ext2fs/ext2fs.h
> +++ b/lib/ext2fs/ext2fs.h
> @@ -1385,6 +1385,17 @@ _INLINE_ blk64_t ext2fs_inode_data_blocks64(ext2_filsys fs,
>  	return ret;
>  }
> 
> +/*
> + * Return the s_blocks_count in 64 bit
> + */
> +_INLINE_ blk64_t ext2fs_super_blocks_count(ext2_filsys fs)
> +{
> +	if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
> +		return (((blk64_t)fs->super->s_blocks_count << 32) |
> +			fs->super->s_blocks_count);
> +	return fs->super->s_blocks_count;
> +}
> +
>  #undef _INLINE_
>  #endif

Shouldn't this pe bart of your previous patch?


-JRS