Index: nfs_vnops.c =================================================================== RCS file: /home/cvsup/freebsd/CVS/src/sys/nfs/nfs_vnops.c,v retrieving revision 1.36.2.6 retrieving revision 1.36.2.7 diff -u -r1.36.2.6 -r1.36.2.7 --- nfs_vnops.c 1998/05/13 05:48:45 1.36.2.6 +++ nfs_vnops.c 1998/05/31 00:07:29 1.36.2.7 @@ -1755,17 +1755,8 @@ struct componentname *a_cnp; } */ *ap; { -#if defined(__NetBSD__) - /* - * Since the args are reversed in the VOP_LINK() calls, - * switch them back. Argh! - */ - register struct vnode *vp = ap->a_tdvp; - register struct vnode *tdvp = ap->a_vp; -#else register struct vnode *vp = ap->a_vp; register struct vnode *tdvp = ap->a_tdvp; -#endif register struct componentname *cnp = ap->a_cnp; register u_long *tl; register caddr_t cp; @@ -1776,11 +1767,8 @@ int v3 = NFS_ISV3(vp); if (vp->v_mount != tdvp->v_mount) { - VOP_ABORTOP(vp, cnp); - if (tdvp == vp) - vrele(tdvp); - else - vput(tdvp); + VOP_ABORTOP(tdvp, cnp); + vput(tdvp); return (EXDEV); }