From b22ea17742b3e354c3ee1372d43630dda21a59f5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 16 Mar 2005 23:38:14 -0500 Subject: [PATCH] getsize.c (blkid_get_dev_size): Fix compilation problem on Darwin systems. --- lib/blkid/ChangeLog | 5 +++++ lib/blkid/getsize.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 43d2863f5..0fc2b4170 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Theodore Ts'o + + * getsize.c (blkid_get_dev_size): Fix compilation problem on + Darwin systems. + 2006-02-05 Theodore Ts'o * Release of E2fsprogs 1.36 diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c index 978097d05..d45e1c2b8 100644 --- a/lib/blkid/getsize.c +++ b/lib/blkid/getsize.c @@ -92,7 +92,7 @@ blkid_loff_t blkid_get_dev_size(int fd) #ifdef DKIOCGETBLOCKCOUNT /* For Apple Darwin */ if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) { if ((sizeof(blkid_loff_t) < sizeof(unsigned long long)) - && ((size64 / (blocksize / 512)) > 0xFFFFFFFF)) + && (size64 << 9 > 0xFFFFFFFF)) return 0; /* EFBIG */ return (blkid_loff_t) size64 << 9; } -- 2.47.3