From: Thomas Nikolajsen <thomas@dragonflybsd.org>
Date: Tue, 21 Aug 2012 21:44:11 +0000 (+0200)
Subject: Merge remote branch 'crater/DragonFly_RELEASE_3_0' into rel3_0
X-Git-Tag: v3.0.3^0
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/e10bce1467feee4b7d668a076797f5b93138c23e?hp=-c

Merge remote branch 'crater/DragonFly_RELEASE_3_0' into rel3_0
---

e10bce1467feee4b7d668a076797f5b93138c23e
diff --combined sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
index 77d1f3a1ad,18bbd76230..7ea306168a
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
@@@ -64,7 -64,6 +64,7 @@@
  #include <vm/vm_zone.h>
  #include "linprocfs.h"
  #include <sys/pioctl.h>
 +#include <sys/spinlock2.h>
  
  #include <machine/limits.h>
  
@@@ -177,7 -176,7 +177,7 @@@ linprocfs_open(struct vop_open_args *ap
  	struct pfsnode *pfs = VTOPFS(ap->a_vp);
  	struct proc *p2;
  
- 	p2 = PFIND(pfs->pfs_pid);
+ 	p2 = linprocfs_pfind(pfs->pfs_pid);
  	if (p2 == NULL)
  		return (ENOENT);
  	if (pfs->pfs_pid && !PRISON_CHECK(ap->a_cred, p2->p_ucred))
@@@ -231,7 -230,7 +231,7 @@@ linprocfs_close(struct vop_close_args *
  		 */
  		p = NULL;
  		if ((ap->a_vp->v_opencount < 2)
- 		    && (p = pfind(pfs->pfs_pid))
+ 		    && (p = linprocfs_pfind(pfs->pfs_pid))
  		    && !(p->p_pfsflags & PF_LINGER)) {
  			p->p_stops = 0;
  			p->p_step = 0;
@@@ -260,7 -259,7 +260,7 @@@ linprocfs_ioctl(struct vop_ioctl_args *
  	struct procfs_status *psp;
  	unsigned char flags;
  
- 	procp = pfind(pfs->pfs_pid);
+ 	procp = linprocfs_pfind(pfs->pfs_pid);
  	if (procp == NULL) {
  		return ENOTTY;
  	}
@@@ -465,7 -464,7 +465,7 @@@ linprocfs_getattr(struct vop_getattr_ar
  		break;
  
  	default:
- 		procp = PFIND(pfs->pfs_pid);
+ 		procp = linprocfs_pfind(pfs->pfs_pid);
  		if (procp == NULL || procp->p_ucred == NULL)
  			return (ENOENT);
  	}
@@@ -844,7 -843,7 +844,7 @@@ linprocfs_lookup(struct vop_old_lookup_
  		if (pid == NO_PID)
  			break;
  
- 		p = PFIND(pid);
+ 		p = linprocfs_pfind(pid);
  		if (p == NULL)
  			break;
  
@@@ -864,7 -863,7 +864,7 @@@
  			goto out;
  		}
  
- 		p = PFIND(pfs->pfs_pid);
+ 		p = linprocfs_pfind(pfs->pfs_pid);
  		if (p == NULL)
  			break;
  
@@@ -991,7 -990,7 +991,7 @@@ linprocfs_readdir_proc(struct vop_readd
  	struct uio *uio = ap->a_uio;
  
  	pfs = VTOPFS(ap->a_vp);
- 	p = PFIND(pfs->pfs_pid);
+ 	p = linprocfs_pfind(pfs->pfs_pid);
  	if (p == NULL)
  		return(0);
  	if (!PRISON_CHECK(ap->a_cred, p->p_ucred))
@@@ -1517,7 -1516,7 +1517,7 @@@ linprocfs_readlink(struct vop_readlink_
  	 * from under us...
  	 */
  	case Pexe:
- 		procp = PFIND(pfs->pfs_pid);
+ 		procp = linprocfs_pfind(pfs->pfs_pid);
  		if (procp == NULL || procp->p_ucred == NULL) {
  			kprintf("linprocfs_readlink: pid %d disappeared\n",
  			    pfs->pfs_pid);
@@@ -1532,7 -1531,7 +1532,7 @@@
  		kfree(freepath, M_TEMP);
  		return (error);
  	case Pcwd:
- 		procp = PFIND(pfs->pfs_pid);
+ 		procp = linprocfs_pfind(pfs->pfs_pid);
  		if (procp == NULL || procp->p_ucred == NULL) {
  			kprintf("linprocfs_readlink: pid %d disappeared\n",
  			    pfs->pfs_pid);
@@@ -1547,7 -1546,7 +1547,7 @@@
  		kfree(freepath, M_TEMP);
  		return (error);
  	case Pprocroot:
- 		procp = PFIND(pfs->pfs_pid);
+ 		procp = linprocfs_pfind(pfs->pfs_pid);
  		if (procp == NULL || procp->p_ucred == NULL) {
  			kprintf("linprocfs_readlink: pid %d disappeared\n",
  			    pfs->pfs_pid);
@@@ -1563,7 -1562,7 +1563,7 @@@
  		kfree(freepath, M_TEMP);
  		return (error);
  	case Pfd:
- 		procp = PFIND(pfs->pfs_pid);
+ 		procp = linprocfs_pfind(pfs->pfs_pid);
  		if (procp == NULL || procp->p_ucred == NULL) {
  			kprintf("linprocfs_readlink: pid %d disappeared\n",
  			    pfs->pfs_pid);