From e458cb776e3f0d435eab771c2887df3a6b76108c Mon Sep 17 00:00:00 2001
From: Gleb Kurtsou <gleb@FreeBSD.org>
Date: Fri, 18 May 2012 10:15:46 +0000
Subject: [PATCH] Don't cast inode number or file size down to long or
 unsigned.

Since ino_t size is about to change to 64-bits, casts to long would
truncate 64-bit numbers on 32-bit archs.

Sponsored by:	Google Summer of Code 2011
---
 lib/libprocstat/cd9660.c     | 4 ++--
 lib/libprocstat/common_kvm.c | 4 ++--
 usr.bin/fstat/fstat.c        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c
index 95882be5d9e..ab95e2a04c3 100644
--- a/lib/libprocstat/cd9660.c
+++ b/lib/libprocstat/cd9660.c
@@ -84,7 +84,7 @@ isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn)
 	}
 	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);
 }
diff --git a/lib/libprocstat/common_kvm.c b/lib/libprocstat/common_kvm.c
index 63302bc4f6e..be05980f183 100644
--- a/lib/libprocstat/common_kvm.c
+++ b/lib/libprocstat/common_kvm.c
@@ -99,9 +99,9 @@ ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn)
 	 * 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);
 }
 
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index fe225a04d38..265791d1daa 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -244,7 +244,7 @@ print_file_info(struct procstat *procstat, struct filestat *fst,
 		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;
 				}