upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 06:15:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nullfs: stop using insmntque1

Browse source 
It adds nothing of value over insmntque.
This commit is contained in:
Mateusz Guzik 2022-01-27 00:53:59 +01:00
parent ade1367ba8
commit 4e91a0b9fe
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/fs/nullfs/null_subr.c
View file

@ -182,14 +182,6 @@ null_destroy_proto(struct vnode *vp, void *xp)
free(xp, M_NULLFSNODE);
}
static void
null_insmntque_dtr(struct vnode *vp, void *xp)
{
vput(((struct null_node *)xp)->null_lowervp);
null_destroy_proto(vp, xp);
}
/*
* Make a new or get existing nullfs node.
* Vp is the alias vnode, lowervp is the lower vnode.
@ -219,7 +211,7 @@ null_nodeget(mp, lowervp, vpp)
}
/*
* The insmntque1() call below requires the exclusive lock on
* The insmntque() call below requires the exclusive lock on
* the nullfs vnode. Upgrade the lock now if hash failed to
* provide ready to use vnode.
*/
@ -252,9 +244,12 @@ null_nodeget(mp, lowervp, vpp)
vp->v_type = lowervp->v_type;
vp->v_data = xp;
vp->v_vnlock = lowervp->v_vnlock;
error = insmntque1(vp, mp, null_insmntque_dtr, xp);
if (error != 0)
error = insmntque(vp, mp);
if (error != 0) {
vput(lowervp);
null_destroy_proto(vp, xp);
return (error);
}
if (lowervp == MOUNTTONULLMOUNT(mp)->nullm_lowerrootvp)
vp->v_vflag |= VV_ROOT;