Remove the 'wantparent' variable, unused since r145004.
Reviewed by: kib MFC after: 2 weeks Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D27193
This commit is contained in:
parent
75fcd27ac2
commit
9c8c797c1a
@ -1305,7 +1305,6 @@ int
|
||||
relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
|
||||
{
|
||||
struct vnode *dp = NULL; /* the directory we are searching */
|
||||
int wantparent; /* 1 => wantparent or lockparent flag */
|
||||
int rdonly; /* lookup read-only flag bit */
|
||||
int error = 0;
|
||||
|
||||
@ -1314,8 +1313,8 @@ relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
|
||||
/*
|
||||
* Setup: break out flag bits into variables.
|
||||
*/
|
||||
wantparent = cnp->cn_flags & (LOCKPARENT|WANTPARENT);
|
||||
KASSERT(wantparent, ("relookup: parent not wanted."));
|
||||
KASSERT((cnp->cn_flags & (LOCKPARENT | WANTPARENT)) != 0,
|
||||
("relookup: parent not wanted"));
|
||||
rdonly = cnp->cn_flags & RDONLY;
|
||||
cnp->cn_flags &= ~ISSYMLINK;
|
||||
dp = dvp;
|
||||
@ -1406,13 +1405,8 @@ relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
|
||||
/*
|
||||
* Set the parent lock/ref state to the requested state.
|
||||
*/
|
||||
if ((cnp->cn_flags & LOCKPARENT) == 0 && dvp != dp) {
|
||||
if (wantparent)
|
||||
if ((cnp->cn_flags & LOCKPARENT) == 0 && dvp != dp)
|
||||
VOP_UNLOCK(dvp);
|
||||
else
|
||||
vput(dvp);
|
||||
} else if (!wantparent)
|
||||
vrele(dvp);
|
||||
/*
|
||||
* Check for symbolic link
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user