Fix bad types for mac blockdev_size()

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os-mac.h b/os/os-mac.h
index 80c49f474e007ea461bd22eb30d16d5b646125de..9f19b8ab1879b00a24340cb4ec168388a4618be9 100644 (file)
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -143,13 +143,17 @@ static inline int fio_set_odirect(int fd)
 
 static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
 
 static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {

-    uint64_t temp = 1;
-    if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, bytes) == -1)
+       uint32_t block_size;
+       uint64_t block_count;
+
+       if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, &block_count) == -1)

                return errno;
                return errno;

-    if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &temp) == -1)
+       if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &block_size) == -1)

                return errno;
                return errno;

-    (*bytes) *= temp;
-    return 0;
+
+       *bytes = block_size;
+       *bytes *= block_count;
+       return 0;

 }
 
 static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 }
 
 static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)