diff options
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r-- | sys/fs/nullfs/null_subr.c | 6 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vnops.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 44de4189..dd60ce8 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -173,7 +173,7 @@ null_insmntque_dtr(struct vnode *vp, void *xp) { vp->v_data = NULL; vp->v_vnlock = &vp->v_lock; - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); vp->v_op = &dead_vnodeops; (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vgone(vp); @@ -218,12 +218,12 @@ null_nodeget(mp, lowervp, vpp) * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(xp, struct null_node *, sizeof(struct null_node), + xp = malloc(sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); error = getnewvnode("null", mp, &null_vnodeops, &vp); if (error) { - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); return (error); } diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 4a41396..9b1edd9 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -677,7 +677,7 @@ null_reclaim(struct vop_reclaim_args *ap) vput(lowervp); } else panic("null_reclaim: reclaiming a node with no lowervp"); - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); return (0); } |