diff options
| author | phk <phk@FreeBSD.org> | 1997-09-10 20:22:32 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-09-10 20:22:32 +0000 |
| commit | 7ef2e93b993137cd1a5efab0ba9236cec28ec144 (patch) | |
| tree | 0c574ae7987ff36f18fb10a1d227a6ef63f22e33 /sys/nfs | |
| parent | a300d400e95ae536e411be55d358e7ab886c2edf (diff) | |
| download | FreeBSD-src-7ef2e93b993137cd1a5efab0ba9236cec28ec144.zip FreeBSD-src-7ef2e93b993137cd1a5efab0ba9236cec28ec144.tar.gz | |
Remove a couple of stubborn NetBSD #if's.
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 66d6467..b276f19 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.48 1997/09/02 01:19:33 bde Exp $ + * $Id: nfs_serv.c,v 1.49 1997/09/10 19:52:25 phk Exp $ */ /* @@ -2099,11 +2099,7 @@ out: if (!error) { nqsrv_getl(vp, ND_WRITE); nqsrv_getl(xp, ND_WRITE); -#if defined(__NetBSD__) || defined(__FreeBSD__) error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd); -#else /* Lite2 version */ - error = VOP_LINK(vp, nd.ni_dvp, &nd.ni_cnd); -#endif } else { VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); if (nd.ni_dvp == nd.ni_vp) diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index e81c8b4..5e2f33b 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.56 1997/08/26 07:32:43 phk Exp $ + * $Id: nfs_vnops.c,v 1.57 1997/09/10 19:52:27 phk Exp $ */ @@ -1699,17 +1699,8 @@ nfs_link(ap) 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; |
