Take VOP_GETVOBJECT() out to pasture. We use the direct pointer now.

1 files changed, 0 insertions, 21 deletions

diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index db0d905..db24279 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -80,7 +80,6 @@ static vop_fsync_t	union_fsync;
 static vop_getacl_t	union_getacl;
 static vop_getattr_t	union_getattr;
 static vop_getextattr_t	union_getextattr;
-static vop_getvobject_t	union_getvobject;
 static vop_inactive_t	union_inactive;
 static vop_ioctl_t	union_ioctl;
 static vop_lease_t	union_lease;
@@ -1701,29 +1700,10 @@ union_destroyvobject(ap)
 		struct vnode *vp;
 	} */ *ap;
 {
-	struct vnode *vp = ap->a_vp;
 
-	vp->v_object = NULL;
 	return (0);
 }
 
-/*
- * Get VM object from the upper or lower vp
- */
-static int
-union_getvobject(ap)
-	struct vop_getvobject_args /* {
-		struct vnode *vp;
-		struct vm_object **objpp;
-	} */ *ap;
-{
-	struct vnode *ovp = OTHERVP(ap->a_vp);
-
-	if (ovp == NULL)
-		return EINVAL;
-	return (VOP_GETVOBJECT(ovp, ap->a_objpp));
-}
-
 static int
 union_print(ap)
 	struct vop_print_args /* {
@@ -2042,7 +2022,6 @@ struct vop_vector union_vnodeops = {
 	.vop_getacl =		union_getacl,
 	.vop_getattr =		union_getattr,
 	.vop_getextattr =	union_getextattr,
-	.vop_getvobject =	union_getvobject,
 	.vop_getwritemount =	union_getwritemount,
 	.vop_inactive =		union_inactive,
 	.vop_ioctl =		union_ioctl,