d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do the vput() for the lowervp in the null_nodeget() for error case too.

Browse Source 
Several callers of null_nodeget() did the cleanup itself, but several
missed it, most prominent being null_bypass(). Remove the cleanup from
the callers, now null_nodeget() handles lowervp free itself.

Reported and tested by:	pho
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2012-01-03 21:09:07 +00:00
parent c7e0c9db2b
commit dd0f9532f3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/fs/nullfs/null_subr.c
View File

@ -171,6 +171,8 @@ null_hashins(mp, xp)
static void
null_insmntque_dtr(struct vnode *vp, void *xp)
{
vput(((struct null_node *)xp)->null_lowervp);
vp->v_data = NULL;
vp->v_vnlock = &vp->v_lock;
free(xp, M_NULLFSNODE);
@ -226,6 +228,7 @@ null_nodeget(mp, lowervp, vpp)
error = getnewvnode("null", mp, &null_vnodeops, &vp);
if (error) {
vput(lowervp);
free(xp, M_NULLFSNODE);
return (error);
}

3
sys/fs/nullfs/null_vfsops.c
View File

@ -157,8 +157,7 @@ nullfs_mount(struct mount *mp)
* Make sure the node alias worked
*/
if (error) {
vrele(lowerrootvp);
free(xmp, M_NULLFSMNT); /* XXX */
free(xmp, M_NULLFSMNT);
return (error);
}

8
sys/fs/nullfs/null_vnops.c
View File

@ -365,9 +365,7 @@ null_lookup(struct vop_lookup_args *ap)
vrele(lvp);
} else {
error = null_nodeget(dvp->v_mount, lvp, &vp);
if (error)
vput(lvp);
else
if (error == 0)
*ap->a_vpp = vp;
}
}
@ -809,9 +807,7 @@ null_vptocnp(struct vop_vptocnp_args *ap)
NULLVPTOLOWERVP(*dvp);
#endif
VOP_UNLOCK(*dvp, 0); /* keep reference on *dvp */
} else
vput(ldvp);
}
vn_lock(vp, locked | LK_RETRY);
return (error);
}