1 files changed, 7 insertions, 9 deletions

diff --git a/open-vm-tools/modules/freebsd/vmblock/vnops.c b/open-vm-tools/modules/freebsd/vmblock/vnops.c
index 129be2eb..4f0ad90c 100644
--- a/open-vm-tools/modules/freebsd/vmblock/vnops.c
+++ b/open-vm-tools/modules/freebsd/vmblock/vnops.c
@@ -23,9 +23,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -755,14 +752,12 @@ struct vop_open_args {
 */
 {
    VMBlockMount *mp;
-   VMBlockNode *mip;
    struct vnode *vp, *ldvp;
    struct file *fp;
    int retval;
 
    vp = ap->a_vp;
    ldvp = VMBVPTOLOWERVP(vp);
-   mip = VPTOVMB(ap->a_vp);
 
    mp = MNTTOVMBLOCKMNT(ap->a_vp->v_mount);
    if (ap->a_vp == mp->rootVnode) {
@@ -1365,7 +1360,9 @@ struct vop_inactive_args {
 */
 {
    struct vnode *vp = ap->a_vp;
+#if __FreeBSD_version < 1000000
    struct thread *td = ap->a_td;
+#endif
 
    vp->v_object = NULL;
 
@@ -1373,8 +1370,11 @@ struct vop_inactive_args {
     * If this is the last reference, then free up the vnode so as not to
     * tie up the lower vnode.
     */
-   vrecycle(vp, td);
-
+#if __FreeBSD_version < 1000000
+    vrecycle(vp, td);
+#else
+   vrecycle(vp);
+#endif
    return 0;
 }
 
@@ -1414,7 +1414,6 @@ struct vop_reclaim_args {
    struct vnode *vp = ap->a_vp;
    struct VMBlockNode *xp = VPTOVMB(vp);
    struct vnode *lowervp = xp->lowerVnode;
-   struct lock *vnlock;
 
    KASSERT(lowervp != NULL, ("reclaiming node with no lower vnode"));
 
@@ -1427,7 +1426,6 @@ struct vop_reclaim_args {
    VI_LOCK(vp);
    vp->v_data = NULL;
    vp->v_object = NULL;
-   vnlock = vp->v_vnlock;
 
    /*
     * Reassign lock pointer to this vnode's lock.  (Originally assigned