checkpoint

[unix-history] / usr / src / sys / miscfs / union / union_vnops.c

diff --git a/usr/src/sys/miscfs/union/union_vnops.c b/usr/src/sys/miscfs/union/union_vnops.c
index 65976d3..0885775 100644 (file)
--- a/usr/src/sys/miscfs/union/union_vnops.c
+++ b/usr/src/sys/miscfs/union/union_vnops.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)union_vnops.c       1.7 (Berkeley) %G%
+ *     @(#)union_vnops.c       1.8 (Berkeley) %G%

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


@@ -402,7 +402,7 @@ union_open(ap)
                                        VOP_UNLOCK(tvp);
                                }
                                VOP_UNLOCK(un->un_uppervp);
                                        VOP_UNLOCK(tvp);
                                }
                                VOP_UNLOCK(un->un_uppervp);

-                               union_vn_close(un->un_uppervp, FWRITE);
+                               union_vn_close(un->un_uppervp, FWRITE, cred, p);

                                VOP_LOCK(un->un_uppervp);
                                if (!error)
                                        uprintf("union: copied up %s\n",
                                VOP_LOCK(un->un_uppervp);
                                if (!error)
                                        uprintf("union: copied up %s\n",


@@ -966,7 +966,7 @@ union_readdir(ap)
        struct union_node *un = VTOUNION(ap->a_vp);
 
        if (un->un_uppervp) {
        struct union_node *un = VTOUNION(ap->a_vp);
 
        if (un->un_uppervp) {

-               struct vnode *vp = OTHERVP(ap->a_vp);
+               struct vnode *vp = un->un_uppervp;

 
                VOP_LOCK(vp);
                error = VOP_READLINK(vp, ap->a_uio, ap->a_cred);
 
                VOP_LOCK(vp);
                error = VOP_READLINK(vp, ap->a_uio, ap->a_cred);


@@ -1102,6 +1102,8 @@ union_lock(ap)
        else
                un->un_pid = -1;
 #endif
        else
                un->un_pid = -1;
 #endif

+
+       return (0);

 }
 
 int
 }
 
 int


@@ -1127,6 +1129,8 @@ union_unlock(ap)
 #ifdef DIAGNOSTIC
        un->un_pid = 0;
 #endif
 #ifdef DIAGNOSTIC
        un->un_pid = 0;
 #endif

+
+       return (0);

 }
 
 int
 }
 
 int