From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 17 Mar 2005 04:38:14 +0000 (-0500)
Subject: getsize.c (blkid_get_dev_size): Fix compilation problem on
X-Git-Tag: E2FSPROGS-1_37~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b22ea17742b3e354c3ee1372d43630dda21a59f5;p=thirdparty%2Fe2fsprogs.git

getsize.c (blkid_get_dev_size): Fix compilation problem on
	Darwin systems.
---

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  <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 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;
 	}