38c38
< * $FreeBSD: head/sys/fs/unionfs/union.h 50477 1999-08-28 01:08:13Z peter $
---
> * $FreeBSD: head/sys/fs/unionfs/union.h 51688 1999-09-26 20:52:41Z dillon $
52,53c52,53
< struct vnode *um_uppervp;
< struct vnode *um_lowervp;
---
> struct vnode *um_uppervp; /* UN_ULOCK holds locking state */
> struct vnode *um_lowervp; /* Left unlocked */
60a61,64
> #ifndef DIAGNOSTIC
> #define DIAGNOSTIC
> #endif
>
70c74,78
< * A cache of vnode references
---
> * A cache of vnode references (hangs off v_data)
> *
> * Placing un_lock as the first elements theoretically allows us to
> * use the vop_stdlock functions. However, we need to make sure of
> * certain side effects so we will still punch in our own code.
72a81
> struct lock un_lock;
81a91
> int un_exclcnt; /* exclusive count */
91,95c101,105
< #define UN_WANT 0x01
< #define UN_LOCKED 0x02
< #define UN_ULOCK 0x04 /* Upper node is locked */
< #define UN_KLOCK 0x08 /* Keep upper node locked on vput */
< #define UN_CACHED 0x10 /* In union cache */
---
> /*
> * XXX UN_ULOCK - indicates that the uppervp is locked
> *
> * UN_CACHED - node is in the union cache
> */
96a107,116
> /*#define UN_ULOCK 0x04*/ /* Upper node is locked */
> #define UN_CACHED 0x10 /* In union cache */
>
> /*
> * Hash table locking flags
> */
>
> #define UNVP_WANT 0x01
> #define UNVP_LOCKED 0x02
>
98c118,119
< struct vnode *, struct vnode *,
---
> struct vnode *,
> struct vnode *,
115a137
> extern void union_vm_coherency __P((struct vnode *, struct uio *, int));
126a149,151
> #define UDEBUG(x) if (uniondebug) printf x
> #define UDEBUG_ENABLED 1
>
128a154,155
> extern int uniondebug;
>