Commit Diff

Commit:
a3e9d8935f71d308cc879e35cc7f8223996c61ca
From:
rsc <devnull@localhost>
Date:
Message:
Fix overflow in old Linux file size.
Actions:
Patch | Tree
commit - a32765e337d2657f09630ebf7bd71d9623269546
commit + a3e9d8935f71d308cc879e35cc7f8223996c61ca
blob - e5e9c9757691c76e4eff21486ff9f4712e63a6e6
blob + 25e6394b52714550d8f8d1978caa00427512492a
--- src/lib9/_p9dir.c
+++ src/lib9/_p9dir.c
@@ -47,6 +47,8 @@ isdisk(struct stat *st)
 #include <linux/hdreg.h>
 #include <linux/fs.h>
 #include <sys/ioctl.h>
+#undef major
+#define major(dev) ((int)(((dev) >> 8) & 0xff))
 static vlong
 disksize(int fd, int dev)
 {
@@ -62,7 +64,7 @@ disksize(int fd, int dev)
 		return u64;
 #endif
 	if(ioctl(fd, BLKGETSIZE, &l) >= 0)
-		return l*512;
+		return (vlong)l*512;
 	if(ioctl(fd, HDIO_GETGEO, &geo) >= 0)
 		return (vlong)geo.heads*geo.sectors*geo.cylinders*512;
 	return 0;