summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-04-14 17:54:07 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-04-14 17:54:07 +0000
commit5d815db0551a699752fa15a73b79ec788902205f (patch)
tree1c7c33f2134571151a70534e77c109ce29708f0b /sys
parent3d3d19715b79871fd3234ac688466c2b6809fa9f (diff)
rename rootvp to rvp to avoid global. ok deraadt@ krw@
Diffstat (limited to 'sys')
-rw-r--r--sys/miscfs/portal/portal_vfsops.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 80c949277db..93c901e2667 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: portal_vfsops.c,v 1.15 2003/02/24 22:32:46 tedu Exp $ */
+/* $OpenBSD: portal_vfsops.c,v 1.16 2003/04/14 17:54:06 tedu Exp $ */
/* $NetBSD: portal_vfsops.c,v 1.14 1996/02/09 22:40:41 christos Exp $ */
/*
@@ -158,7 +158,7 @@ portal_unmount(mp, mntflags, p)
int mntflags;
struct proc *p;
{
- struct vnode *rootvp = VFSTOPORTAL(mp)->pm_root;
+ struct vnode *rvp = VFSTOPORTAL(mp)->pm_root;
int error, flags = 0;
if (mntflags & MNT_FORCE) {
@@ -175,19 +175,19 @@ portal_unmount(mp, mntflags, p)
if (mntinvalbuf(mp, 1))
return (EBUSY);
#endif
- if (rootvp->v_usecount > 1)
+ if (rvp->v_usecount > 1)
return (EBUSY);
- if ((error = vflush(mp, rootvp, flags)) != 0)
+ if ((error = vflush(mp, rvp, flags)) != 0)
return (error);
/*
* Release reference on underlying root vnode
*/
- vrele(rootvp);
+ vrele(rvp);
/*
* And blow it away for future re-use
*/
- vgone(rootvp);
+ vgone(rvp);
/*
* Shutdown the socket. This will cause the select in the
* daemon to wake up, and then the accept will get ECONNABORTED