diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2005-03-16 23:38:14 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2005-03-16 23:38:14 -0500 |
| commit | b22ea17742b3e354c3ee1372d43630dda21a59f5 (patch) | |
| tree | 2aa1803dc95fa18f0e435a141538bade970cf24c | |
| parent | 4aad4daee4b47c9b165e6ddcb701068d64d7d87f (diff) | |
| download | e2fsprogs-b22ea17742b3e354c3ee1372d43630dda21a59f5.tar.gz | |
getsize.c (blkid_get_dev_size): Fix compilation problem on
Darwin systems.
| -rw-r--r-- | lib/blkid/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/blkid/getsize.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 43d2863f..0fc2b417 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Theodore Ts'o <tytso@mit.edu> + + * getsize.c (blkid_get_dev_size): Fix compilation problem on + Darwin systems. + 2006-02-05 Theodore Ts'o <tytso@mit.edu> * Release of E2fsprogs 1.36 diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c index 978097d0..d45e1c2b 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; } |