checkpoint

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

diff --git a/usr/src/sys/miscfs/union/union.h b/usr/src/sys/miscfs/union/union.h
index 42ba138..c8172a7 100644 (file)
--- a/usr/src/sys/miscfs/union/union.h
+++ b/usr/src/sys/miscfs/union/union.h
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)union.h     1.6 (Berkeley) %G%
+ *     @(#)union.h     1.8 (Berkeley) %G%

  */
 
 struct union_args {
  */
 
 struct union_args {


@@ -42,9 +42,12 @@ struct union_node {
        struct vnode            *un_lowervp;    /* underlying object */
        struct vnode            *un_dirvp;      /* Parent dir of uppervp */
        char                    *un_path;       /* saved component name */
        struct vnode            *un_lowervp;    /* underlying object */
        struct vnode            *un_dirvp;      /* Parent dir of uppervp */
        char                    *un_path;       /* saved component name */

-       int                     un_open;        /* # of opens on lowervp */
+       int                     un_hash;        /* saved un_path hash value */
+       int                     un_openl;       /* # of opens on lowervp */

        int                     un_flags;
        int                     un_flags;

+#ifdef DIAGNOSTIC

        pid_t                   un_pid;
        pid_t                   un_pid;

+#endif

 };
 
 #define UN_WANT 0x01
 };
 
 #define UN_WANT 0x01


@@ -60,6 +63,10 @@ extern int union_mkshadow __P((struct union_mount *, struct vnode *,
                                struct componentname *, struct vnode **));
 extern int union_vn_create __P((struct vnode **, struct union_node *,
                                struct proc *));
                                struct componentname *, struct vnode **));
 extern int union_vn_create __P((struct vnode **, struct union_node *,
                                struct proc *));

+extern int union_cn_close __P((struct vnode *, int, struct ucred *,
+                               struct proc *));
+extern void union_removed_upper __P((struct union_node *un));
+extern struct vnode *union_lowervp __P((struct vnode *));

 
 #define        MOUNTTOUNIONMOUNT(mp) ((struct union_mount *)((mp)->mnt_data))
 #define        VTOUNION(vp) ((struct union_node *)(vp)->v_data)
 
 #define        MOUNTTOUNIONMOUNT(mp) ((struct union_mount *)((mp)->mnt_data))
 #define        VTOUNION(vp) ((struct union_node *)(vp)->v_data)