must have directory vnode as first op

SCCS-vsn: sys/kern/vfs_syscalls.c 7.80
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.82
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.82

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 0c0d108..0673bc0 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_syscalls.c      7.79 (Berkeley) %G%
+ *     @(#)vfs_syscalls.c      7.80 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -765,7 +765,7 @@ out:
        if (!error) {
                LEASE_CHECK(xp, p, p->p_ucred, LEASE_WRITE);
                LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
        if (!error) {
                LEASE_CHECK(xp, p, p->p_ucred, LEASE_WRITE);
                LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);

-               error = VOP_LINK(vp, nd.ni_dvp, &nd.ni_cnd);
+               error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);

        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                if (nd.ni_dvp == nd.ni_vp)
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                if (nd.ni_dvp == nd.ni_vp)

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index ceef54c..c44b31d 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.81 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.82 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -554,9 +554,9 @@ ufs_remove(dvp, vp, cnp)
  * link vnode call
  */
 int
  * link vnode call
  */
 int

-ufs_link(vp, tdvp, cnp)
-       register struct vnode *vp;   /* source vnode */
+ufs_link(tdvp, vp, cnp)

        struct vnode *tdvp;
        struct vnode *tdvp;

+       register struct vnode *vp;   /* source vnode */

        struct componentname *cnp;
 {
        register struct inode *ip;
        struct componentname *cnp;
 {
        register struct inode *ip;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index ceef54c..c44b31d 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.81 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.82 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -554,9 +554,9 @@ ufs_remove(dvp, vp, cnp)
  * link vnode call
  */
 int
  * link vnode call
  */
 int

-ufs_link(vp, tdvp, cnp)
-       register struct vnode *vp;   /* source vnode */
+ufs_link(tdvp, vp, cnp)

        struct vnode *tdvp;
        struct vnode *tdvp;

+       register struct vnode *vp;   /* source vnode */

        struct componentname *cnp;
 {
        register struct inode *ip;
        struct componentname *cnp;
 {
        register struct inode *ip;