Re: [PATCH 15/15][e2fsprogs] 64-bit mke2fs cleanup

[Goswin von Brederlow <goswin-v-b@web.de>]

"Jose R. Santos" <jrs@us.ibm.com> writes:

> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> index 7171990..817be56 100644
> --- a/misc/mke2fs.c
> +++ b/misc/mke2fs.c
> @@ -1402,12 +1402,12 @@ static void PRS(int argc, char *argv[])
>  
>  	fs_param.s_log_frag_size = fs_param.s_log_block_size;
>  
> -	if (noaction && fs_param.s_blocks_count) {
> -		dev_size = fs_param.s_blocks_count;
> +	if (noaction && ext2fs_blocks_count(&fs_param)) {
> +		dev_size = ext2fs_blocks_count(&fs_param);
>  		retval = 0;
>  	} else {
>  	retry:
> -		retval = ext2fs_get_device_size(device_name,
> +		retval = ext2fs_get_device_size2(device_name,
>  						EXT2_BLOCK_SIZE(&fs_param),
>  						&dev_size);
>  		if ((retval == EFBIG) &&

You should not assume that ext2fs_get_device_size2() will return EFBIG
if the size exceed 2^32 blocks. The point of ext2fs_get_device_size2()
was to be able to support more than 2^32 blocks and the library
function will certainly change to return larger numbers in the future.

So you need something like

if ((retval == EFBIG || dev_size >= (1ULL << 32)) &&

MfG
        Goswin