Verify if e2fsprogs needs changes for __uint64_t type

[Andrew Bradford]

e2fsprogs uses the __uint64_t type, which is a valid typedef in glibc for unsigned long long int on 32 bit platforms but appears to not be present in musl.

See: ​http://lists.cross-lfs.org/pipermail/clfs-dev-cross-lfs.org/2013-October/001774.html

[Andrew Bradford]

There's only 1 function in e2fsprogs that uses __uint64_t and there appears to be no reason to do so. Changing this one function to use uint64_t instead (but *NOT* unsigned long long int) should fix the issue for all 32 and 64 bit platforms.

diff -Naur e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c e2fsprogs-1.42.8/lib/ext2fs/unix_io.c
--- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c	2013-10-24 15:50:44.234297410 -0400
+++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c	2013-10-24 16:29:06.436142156 -0400
@@ -931,10 +931,10 @@
 
 	if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
 #ifdef BLKDISCARD
-		__uint64_t range[2];
+		uint64_t range[2];
 
-		range[0] = (__uint64_t)(block) * channel->block_size;
-		range[1] = (__uint64_t)(count) * channel->block_size;
+		range[0] = (uint64_t)(block) * channel->block_size;
+		range[1] = (uint64_t)(count) * channel->block_size;
 
 		ret = ioctl(data->dev, BLKDISCARD, &range);
 #else

[William Harrington]

I'm working with the Raspberry Pi, you sent me, and this I had to apply for E2fsprogs. 1.42.7 and 1.42.8.

[Andrew Bradford]

e2fsprogs have been removed from the beyond section of the 20140613 book, making this ticket no longer needed.