diff options
author | peter <peter@FreeBSD.org> | 1997-03-25 05:13:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-03-25 05:13:40 +0000 |
commit | 5dc5a09bf19410c78fae9a19e89501440c2088b6 (patch) | |
tree | fef3d1e2b2722cf2ac89c274c960875631923029 | |
parent | 6c63b328f925904361277656b226e772108cbf9e (diff) | |
download | FreeBSD-src-5dc5a09bf19410c78fae9a19e89501440c2088b6.zip FreeBSD-src-5dc5a09bf19410c78fae9a19e89501440c2088b6.tar.gz |
Use the correct (relative to the implementation) ordering of args in
the VOP_LINK() calls, Closes PR#3064
Submitted by: bde
-rw-r--r-- | sys/nfs/nfs_serv.c | 6 | ||||
-rw-r--r-- | sys/nfsserver/nfs_serv.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 9109442..e39c243 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.37 1997/02/22 09:42:38 peter Exp $ + * $Id: nfs_serv.c,v 1.38 1997/03/25 05:08:28 peter Exp $ */ /* @@ -2030,7 +2030,11 @@ 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/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 9109442..e39c243 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.37 1997/02/22 09:42:38 peter Exp $ + * $Id: nfs_serv.c,v 1.38 1997/03/25 05:08:28 peter Exp $ */ /* @@ -2030,7 +2030,11 @@ 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) |