diff options
| author | Boris Popov <bp@FreeBSD.org> | 2001-05-17 04:40:01 +0000 |
|---|---|---|
| committer | Boris Popov <bp@FreeBSD.org> | 2001-05-17 04:40:01 +0000 |
| commit | 9dbd7336eeaf3bacd7807be4a83bc83d37ab257f (patch) | |
| tree | 9d2d0b10440711a9b9489b25370d26ef40767e7a /sys/miscfs | |
| parent | fa4fd1324a8e18df75c63db8768ecd42654e7f28 (diff) | |
Notes
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/union/union_subr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index b4f2802c69ac2..c59a41fa4c624 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -304,7 +304,7 @@ union_newsize(vp, uppersz, lowersz) * not locked, and will be dereferenced on return. * * lowervp Holds the new lowervp vnode to be stored in the - * union_node we are allocating. uppervp is referenced but + * union_node we are allocating. lowervp is referenced but * not locked, and will be dereferenced on return. * * cnp Holds path component information to be coupled with @@ -346,7 +346,6 @@ union_allocvp(vpp, mp, dvp, upperdvp, cnp, uppervp, lowervp, docache) { int error; struct union_node *un = 0; - struct vnode *xlowervp = NULLVP; struct union_mount *um = MOUNTTOUNIONMOUNT(mp); struct proc *p = (cnp) ? cnp->cn_proc : curproc; int hash = 0; @@ -357,7 +356,7 @@ union_allocvp(vpp, mp, dvp, upperdvp, cnp, uppervp, lowervp, docache) panic("union: unidentifiable allocation"); if (uppervp && lowervp && (uppervp->v_type != lowervp->v_type)) { - xlowervp = lowervp; + vrele(lowervp); lowervp = NULLVP; } @@ -599,9 +598,6 @@ loop: } out: - if (xlowervp) - vrele(xlowervp); - if (docache) union_list_unlock(hash); |
