Deleted Added
full compact
37,38c37,38
< * @(#)union.h 8.2 (Berkeley) 2/17/94
< * $FreeBSD: head/sys/fs/unionfs/union.h 21673 1997-01-14 07:20:47Z jkh $
---
> * @(#)union.h 8.9 (Berkeley) 12/10/94
> * $FreeBSD: head/sys/fs/unionfs/union.h 22521 1997-02-10 02:22:35Z dyson $
77a78
> struct vnode *un_pvp; /* Parent vnode */
81c82,85
< int un_flags;
---
> unsigned int un_flags;
> struct vnode **un_dircache; /* cached union stack */
> off_t un_uppersz; /* size of upper object */
> off_t un_lowersz; /* size of lower object */
90a95
> #define UN_CACHED 0x10 /* In union cache */
95c100
< struct vnode *));
---
> struct vnode *, int));
97,98c102,107
< extern int union_copyfile __P((struct proc *, struct ucred *,
< struct vnode *, struct vnode *));
---
> extern int union_copyfile __P((struct vnode *, struct vnode *,
> struct ucred *, struct proc *));
> extern int union_copyup __P((struct union_node *, int, struct ucred *,
> struct proc *));
> extern int union_dowhiteout __P((struct union_node *, struct ucred *,
> struct proc *));
100a110,111
> extern int union_mkwhiteout __P((struct union_mount *, struct vnode *,
> struct componentname *, char *));
110a122
> extern void union_newsize __P((struct vnode *, off_t, off_t));