From owner-p4-projects@FreeBSD.ORG  Sun Jan 18 12:23:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 46182106567C; Sun, 18 Jan 2009 12:23:13 +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 F218E1065676
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 12:23:12 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DE8608FC29
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 12:23:12 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ICNC7o052664
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 12:23:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ICNCxr052662
	for perforce@freebsd.org; Sun, 18 Jan 2009 12:23:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 18 Jan 2009 12:23:12 GMT
Message-Id: <200901181223.n0ICNCxr052662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156324 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: Sun, 18 Jan 2009 12:23:14 -0000

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

Change 156324 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 12:22:37

	Export procdesc pid in filedesc sysctl so that procstat sees it;
	not exported by ofiledesc.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#14 (text+ko) ====

@@ -2643,7 +2643,6 @@
 	struct proc *p;
 	struct tty *tp;
 	int vfslocked;
-	pid_t pid;
 
 	name = (int *)arg1;
 	if ((p = pfind((pid_t)name[0])) == NULL)
@@ -2675,7 +2674,6 @@
 		vp = NULL;
 		so = NULL;
 		tp = NULL;
-		pid = 0;
 		kif->kf_fd = i;
 		switch (fp->f_type) {
 		case DTYPE_VNODE:
@@ -2728,7 +2726,6 @@
 			break;
 
 		case DTYPE_PROCDESC:
-			pid = ((struct procdesc *)fp->f_data)->pd_pid;
 			kif->kf_type = KF_TYPE_PROCDESC;
 			break;
 
@@ -2905,7 +2902,6 @@
 	struct proc *p;
 	struct tty *tp;
 	int vfslocked;
-	pid_t pid;
 
 	name = (int *)arg1;
 	if ((p = pfind((pid_t)name[0])) == NULL)
@@ -2987,8 +2983,8 @@
 			break;
 
 		case DTYPE_PROCDESC:
-			pid = ((struct procdesc *)fp->f_data)->pd_pid;
 			kif->kf_type = KF_TYPE_PROCDESC;
+			kif->kf_pid = ((struct procdesc *)fp->f_data)->pd_pid;
 			break;
 
 		default: