tst_getsize: use ext2fs_get_device_size2() to support testing large devices

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index 726568214..bcf30208e 100644
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -303,7 +303,7 @@ errcode_t ext2fs_get_device_size(const char *file, int blocksize,
 #ifdef DEBUG
 int main(int argc, char **argv)
 {
-	blk_t	blocks;
+	blk64_t	blocks;
 	int	retval;
 
 	if (argc < 2) {
@@ -311,13 +311,14 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	retval = ext2fs_get_device_size(argv[1], 1024, &blocks);
+	retval = ext2fs_get_device_size2(argv[1], 1024, &blocks);
 	if (retval) {
 		com_err(argv[0], retval,
 			"while calling ext2fs_get_device_size");
 		exit(1);
 	}
-	printf("Device %s has %u 1k blocks.\n", argv[1], blocks);
+	printf("Device %s has %llu 1k blocks.\n", argv[1],
+	       (unsigned long long) locks);
 	exit(0);
 }
 #endif
diff --git a/lib/ext2fs/tst_getsize.c b/lib/ext2fs/tst_getsize.c
index 4ac2ea1f1..ba869dcec 100644
--- a/lib/ext2fs/tst_getsize.c
+++ b/lib/ext2fs/tst_getsize.c
@@ -29,18 +29,19 @@
 int main(int argc, const char *argv[])
 {
 	errcode_t	retval;
-	blk_t		blocks;
+	blk64_t		blocks;
 
 	if (argc < 2) {
 		fprintf(stderr, "%s device\n", argv[0]);
 		exit(1);
 	}
 	add_error_table(&et_ext2_error_table);
-	retval = ext2fs_get_device_size(argv[1], 1024, &blocks);
+	retval = ext2fs_get_device_size2(argv[1], 1024, &blocks);
 	if (retval) {
 		com_err(argv[0], retval, "while getting device size");
 		exit(1);
 	}
-	printf("%s is device has %u blocks.\n", argv[1], blocks);
+	printf("%s is device has %llu blocks.\n", argv[1],
+	       (unsigned long long) blocks);
 	return 0;
 }