diff mbox series

[3/6] mke2fs: use ext2fs_get_device_size2() on all platforms

Message ID 20210616045334.1655288-4-ebiggers@kernel.org
State Accepted
Headers show
Series e2fsprogs: fix compiler warnings introduced since v1.45.4 | expand

Commit Message

Eric Biggers June 16, 2021, 4:53 a.m. UTC 
From: Eric Biggers <ebiggers@google.com>

Since commit e8c858047be6 ("libext2fs: fix build issue for on
Windows/Cygwin systems"), ext2fs_get_device_size2() is available in
Windows builds of libext2fs.  So there is no need for mke2fs to call
ext2fs_get_device_size() instead.

This fixes a -Wincompatible-pointer-types warning because
ext2fs_get_device_size() was being passed a 'blk64_t *', but it expected
a 'blk_t *'.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 misc/mke2fs.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Theodore Ts'o July 7, 2021, 2:43 a.m. UTC | #1 
On Tue, Jun 15, 2021 at 09:53:31PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Since commit e8c858047be6 ("libext2fs: fix build issue for on
> Windows/Cygwin systems"), ext2fs_get_device_size2() is available in
> Windows builds of libext2fs.  So there is no need for mke2fs to call
> ext2fs_get_device_size() instead.
> 
> This fixes a -Wincompatible-pointer-types warning because
> ext2fs_get_device_size() was being passed a 'blk64_t *', but it expected
> a 'blk_t *'.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Applied, thanks.

					- Ted
diff mbox series

Patch

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index afbcf486..d5ab334e 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1989,15 +1989,9 @@  profile_error:
 		dev_size = fs_blocks_count;
 		retval = 0;
 	} else
-#ifndef _WIN32
 		retval = ext2fs_get_device_size2(device_name,
 						 EXT2_BLOCK_SIZE(&fs_param),
 						 &dev_size);
-#else
-		retval = ext2fs_get_device_size(device_name,
-						EXT2_BLOCK_SIZE(&fs_param),
-						&dev_size);
-#endif
 	if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) {
 		com_err(program_name, retval, "%s",
 			_("while trying to determine filesystem size"));