socsvn commit: r223084 - in soc2011/gk/ino64-head: lib/libprocstat usr.bin/fstat

[gk at FreeBSD.org]

Author: gk
Date: Fri Jun 10 20:54:56 2011
New Revision: 223084
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223084

Log:
  Don't cast uint64_t inode number or size down to long or unsigned
  
  Casting to long will drop significant bits on 32bit archs
  
  *node.i_number and *node.i_size are unsigned

Modified:
  soc2011/gk/ino64-head/lib/libprocstat/cd9660.c
  soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c
  soc2011/gk/ino64-head/usr.bin/fstat/fstat.c

Modified: soc2011/gk/ino64-head/lib/libprocstat/cd9660.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libprocstat/cd9660.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/lib/libprocstat/cd9660.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -84,7 +84,7 @@
 	}
 	vn->vn_fsid = dev2udev(kd, mnt.im_dev);
 	vn->vn_mode = (mode_t)isonode.inode.iso_mode;
-	vn->vn_fileid = (long)isonode.i_number;
-	vn->vn_size = (u_long)isonode.i_size;
+	vn->vn_fileid = isonode.i_number;
+	vn->vn_size = isonode.i_size;
 	return (0);
 }

Modified: soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -99,9 +99,9 @@
 	 * comparisons
 	 */
 	vn->vn_fsid = dev2udev(kd, inode.i_dev);
-	vn->vn_fileid = (long)inode.i_number;
+	vn->vn_fileid = inode.i_number;
 	vn->vn_mode = (mode_t)inode.i_mode;
-	vn->vn_size = (u_long)inode.i_size;
+	vn->vn_size = inode.i_size;
 	return (0);
 }
 

Modified: soc2011/gk/ino64-head/usr.bin/fstat/fstat.c
==============================================================================
--- soc2011/gk/ino64-head/usr.bin/fstat/fstat.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/usr.bin/fstat/fstat.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -242,7 +242,7 @@
 		for (d = devs; d != NULL; d = d->next)
 			if (d->fsid == vn.vn_fsid) {
 				fsmatch = 1;
-				if ((unsigned)d->ino == vn.vn_fileid) {
+				if (d->ino == vn.vn_fileid) {
 					filename = d->name;
 					break;
 				}