linux-ext4 - Re: [PATCH] e2fsck: remove #ifdef EXT2_NO_64

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 28 Jun 2017 10:38:20 -0600
From:   Andreas Dilger <adilger@...ger.ca>
To:     Tahsin Erdogan <tahsin@...gle.com>
Cc:     "Darrick J . Wong" <darrick.wong@...cle.com>,
        Theodore Ts'o <tytso@....edu>, linux-ext4@...r.kernel.org
Subject: Re: [PATCH] e2fsck: remove #ifdef EXT2_NO_64_TYPE blocks

On Jun 27, 2017, at 7:22 PM, Tahsin Erdogan <tahsin@...gle.com> wrote:
> 
> EXT2_NO_64_TYPE is not defined anywhere. It appears to be a
> historical artifact.
> 
> Signed-off-by: Tahsin Erdogan <tahsin@...gle.com>

Reviewed-by: Andreas Dilger <adilger@...ger.ca>

> ---
> e2fsck/message.c | 42 ++----------------------------------------
> 1 file changed, 2 insertions(+), 40 deletions(-)
> 
> diff --git a/e2fsck/message.c b/e2fsck/message.c
> index 525f4a1e7628..46522d10fbb1 100644
> --- a/e2fsck/message.c
> +++ b/e2fsck/message.c
> @@ -280,17 +280,8 @@ static _INLINE_ void expand_inode_expression(FILE *f, ext2_filsys fs, char ch,
> 	case 's':
> 		if (LINUX_S_ISDIR(inode->i_mode))
> 			fprintf(f, "%u", inode->i_size);
> -		else {
> -#ifdef EXT2_NO_64_TYPE
> -			if (inode->i_size_high)
> -				fprintf(f, "0x%x%08x", inode->i_size_high,
> -					inode->i_size);
> -			else
> -				fprintf(f, "%u", inode->i_size);
> -#else
> +		else
> 			fprintf(f, "%llu", EXT2_I_SIZE(inode));
> -#endif
> -		}
> 		break;
> 	case 'S':
> 		fprintf(f, "%u", large_inode->i_extra_isize);
> @@ -411,11 +402,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
> 		fputc('%', f);
> 		break;
> 	case 'b':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "%*u", width, (unsigned long) ctx->blk);
> -#else
> 		fprintf(f, "%*llu", width, (unsigned long long) ctx->blk);
> -#endif
> 		break;
> 	case 'B':
> 		if (ctx->blkcount == BLOCK_COUNT_IND)
> @@ -431,20 +418,11 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
> 		if (*first && islower(m[0]))
> 			fputc(toupper(*m++), f);
> 		fputs(m, f);
> -		if (ctx->blkcount >= 0) {
> -#ifdef EXT2_NO_64_TYPE
> -			fprintf(f, "%d", ctx->blkcount);
> -#else
> +		if (ctx->blkcount >= 0)
> 			fprintf(f, "%lld", (long long) ctx->blkcount);
> -#endif
> -		}
> 		break;
> 	case 'c':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "%*u", width, (unsigned long) ctx->blk2);
> -#else
> 		fprintf(f, "%*llu", width, (unsigned long long) ctx->blk2);
> -#endif
> 		break;
> 	case 'd':
> 		fprintf(f, "%*u", width, ctx->dir);
> @@ -462,18 +440,10 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
> 		fprintf(f, "%*s", width, error_message(ctx->errcode));
> 		break;
> 	case 'N':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "%*u", width, ctx->num);
> -#else
> 		fprintf(f, "%*llu", width, (long long)ctx->num);
> -#endif
> 		break;
> 	case 'n':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "%*u", width, ctx->num2);
> -#else
> 		fprintf(f, "%*llu", width, (long long)ctx->num2);
> -#endif
> 		break;
> 	case 'p':
> 		print_pathname(f, fs, ctx->ino, 0);
> @@ -489,11 +459,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
> 		print_pathname(f, fs, ctx->dir, ctx->ino);
> 		break;
> 	case 'r':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "%*d", width, ctx->blkcount);
> -#else
> 		fprintf(f, "%*lld", width, (long long) ctx->blkcount);
> -#endif
> 		break;
> 	case 'S':
> 		fprintf(f, "%llu", get_backup_sb(NULL, fs, NULL, NULL));
> @@ -511,11 +477,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
> 		fprintf(f, "0x%0*x", width, ctx->csum1);
> 		break;
> 	case 'X':
> -#ifdef EXT2_NO_64_TYPE
> -		fprintf(f, "0x%0*x", width, ctx->num);
> -#else
> 		fprintf(f, "0x%0*llx", width, (long long)ctx->num);
> -#endif
> 		break;
> 	case 'y':
> 		fprintf(f, "0x%0*x", width, ctx->csum2);
> --
> 2.13.2.725.g09c95d1e9-goog
> 


Cheers, Andreas






Download attachment "signature.asc" of type "application/pgp-signature" (196 bytes)