From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 15:58:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3354106567A; Thu, 30 Oct 2008 15:58:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 873CB1065676
	for <perforce@freebsd.org>; Thu, 30 Oct 2008 15:58:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 758EA8FC20
	for <perforce@freebsd.org>; Thu, 30 Oct 2008 15:58:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UFwtUH055063
	for <perforce@freebsd.org>; Thu, 30 Oct 2008 15:58:55 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9UFwtca055061
	for perforce@freebsd.org; Thu, 30 Oct 2008 15:58:55 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Thu, 30 Oct 2008 15:58:55 GMT
Message-Id: <200810301558.m9UFwtca055061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152214 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2008 15:58:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=152214

Change 152214 by peter@peter_overcee on 2008/10/30 15:58:00

	Use the same naming for inode/device fields as struct vattr.

Affected files ...

.. //depot/projects/hammer/sys/kern/kern_proc.c#74 edit
.. //depot/projects/hammer/sys/sys/user.h#31 edit

Differences ...

==== //depot/projects/hammer/sys/kern/kern_proc.c#74 (text+ko) ====

@@ -1341,6 +1341,8 @@
 	unsigned int last_timestamp;
 	char *fullpath, *freepath;
 	struct kinfo_vmentry *kve;
+	struct vattr va;
+	struct ucred *cred;
 	int error, *name;
 	struct vnode *vp;
 	struct proc *p;
@@ -1400,6 +1402,8 @@
 			lobj = tobj;
 		}
 
+		kve->kve_fileid = 0;
+		kve->kve_rdev = 0;
 		freepath = NULL;
 		fullpath = "";
 		if (lobj) {
@@ -1440,8 +1444,14 @@
 				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 				vn_fullpath(curthread, vp, &fullpath,
 				    &freepath);
+				cred = curthread->td_ucred;
+				if (VOP_GETATTR(vp, &va, cred) == 0) {
+					kve->kve_fileid = va.va_fileid;
+					kve->kve_rdev = va.va_rdev;
+				}
 				vput(vp);
 				VFS_UNLOCK_GIANT(vfslocked);
+
 			}
 		} else {
 			kve->kve_type = KVME_TYPE_NONE;

==== //depot/projects/hammer/sys/sys/user.h#31 (text+ko) ====

@@ -327,8 +327,8 @@
 	char	 kve_path[PATH_MAX];		/* Path to VM obj, if any. */
 	void	*_kve_pspare[8];		/* Space for more stuff. */
 	off_t	 kve_offset;			/* Mapping offset in object */
-	uint64_t kve_fileno;			/* inode number of vnode */
-	dev_t	 kve_dev;			/* dev_t of vnode */
+	uint64_t kve_fileid;			/* inode number of vnode */
+	dev_t	 kve_rdev;			/* dev_t of vnode location */
 	int	 _kve_ispare[3];		/* Space for more stuff. */
 };