libext2fs: support devices w/ non-512 byte block size on Apple Darwin

Signed-off-by: Fedor Uporov <thisisadrgreenthumb@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index 4e2835f654b3ded4b51b7176de78d96d011524c3..75f21d5c19edaee51f79257f74ad6c0e8aa1dca4 100644 (file)
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -78,12 +78,15 @@ blkid_loff_t blkid_get_dev_size(int fd)
        unsigned long long size64;
        blkid_loff_t high, low;
 
-#ifdef DKIOCGETBLOCKCOUNT      /* For Apple Darwin */
-       if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
+#if defined DKIOCGETBLOCKCOUNT && defined DKIOCGETBLOCKSIZE    /* For Apple Darwin */
+       unsigned int size;
+
+       if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0 &&
+           ioctl(fd, DKIOCGETBLOCKSIZE, &size) >= 0) {
                if (sizeof(blkid_loff_t) < sizeof(unsigned long long) &&
-                   (size64 << 9) > 0xFFFFFFFF)
+                   (size64 * size) > 0xFFFFFFFF)
                        return 0; /* EFBIG */
-               return (blkid_loff_t)size64 << 9;
+               return (blkid_loff_t)size64 * size;
        }
 #endif
 

diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index f3839ba3a011fd2bd3cf740d4d45abef9d82c8f0..be067755fd56703368fe6e56119706435f1d11f9 100644 (file)
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -151,9 +151,12 @@ errcode_t ext2fs_get_device_size2(const char *file, int blocksize,
        if (fd < 0)
                return errno;
 
-#ifdef DKIOCGETBLOCKCOUNT      /* For Apple Darwin */
-       if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
-               *retblocks = size64 / (blocksize / 512);
+#if defined DKIOCGETBLOCKCOUNT && defined DKIOCGETBLOCKSIZE    /* For Apple Darwin */
+       unsigned int size;
+
+       if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0 &&
+           ioctl(fd, DKIOCGETBLOCKSIZE, &size) >= 0) {
+               *retblocks = size64 * size / blocksize;
                goto out;
        }
 #endif