diff options
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_object.c | 8 | ||||
| -rw-r--r-- | sys/vm/vm_swap.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c0c7b25379499..47940888dadb5 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.98 1997/09/21 04:24:22 dyson Exp $ + * $Id: vm_object.c,v 1.99 1997/10/24 23:41:00 dyson Exp $ */ /* @@ -406,16 +406,16 @@ vm_object_terminate(object) */ if (object->type == OBJT_VNODE) { struct vnode *vp = object->handle; - struct proc *p = curproc; /* XXX */ + struct proc *cp = curproc; /* XXX */ int waslocked; waslocked = VOP_ISLOCKED(vp); if (!waslocked) - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, cp); vm_object_page_clean(object, 0, 0, TRUE, FALSE); vinvalbuf(vp, V_SAVE, NOCRED, NULL, 0, 0); if (!waslocked) - VOP_UNLOCK(vp, 0, p); + VOP_UNLOCK(vp, 0, cp); } /* diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index c0e5d47e2a7a7..3eec6864982d3 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.47 1997/09/14 03:19:42 peter Exp $ + * $Id: vm_swap.c,v 1.48 1997/11/06 19:29:56 phk Exp $ */ #include <sys/param.h> @@ -281,21 +281,21 @@ swaponvp(p, vp, dev, nblks) } if (!swapdev_vp) { - struct vnode *vp; + struct vnode *vp1; struct vnode *nvp; error = getnewvnode(VT_NON, (struct mount *) 0, spec_vnodeop_p, &nvp); if (error) panic("Cannot get vnode for swapdev"); - vp = nvp; - vp->v_type = VBLK; - if ((nvp = checkalias(vp, swapdev, + vp1 = nvp; + vp1->v_type = VBLK; + if ((nvp = checkalias(vp1, swapdev, (struct mount *) 0))) { - vput(vp); - vp = nvp; + vput(vp1); + vp1 = nvp; } - swapdev_vp = vp; + swapdev_vp = vp1; } return (0); } |