Remove a couple of stubborn NetBSD #if's.
This commit is contained in:
parent
bf1d104a34
commit
ec1b5c319d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=29291
@ -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 @@ nfsrv_link(nfsd, slp, procp, mrq)
|
||||
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)
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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 @@ nfsrv_link(nfsd, slp, procp, mrq)
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user