aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2021-06-15 21:53:31 -0700
committerTheodore Ts'o <tytso@mit.edu>2021-07-06 22:43:25 -0400
commit108f3021a6b68a86eae3bd9da7f9ce8a1568ce50 (patch)
tree24593dc9984c33080e454e2263b1793f969d60d6
parent6c60acbb945701a08373bee5b0689563eedf6ed2 (diff)
downloade2fsprogs-108f3021a6b68a86eae3bd9da7f9ce8a1568ce50.tar.gz
mke2fs: use ext2fs_get_device_size2() on all platforms
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> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--misc/mke2fs.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index afbcf486b..d5ab334ed 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"));