X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..3903760236c30e3b5ace7a4eefac3a269d68957c:/bsd/miscfs/union/union.h

diff --git a/bsd/miscfs/union/union.h b/bsd/miscfs/union/union.h
index c2ad169ce..eee3e5a87 100644
--- a/bsd/miscfs/union/union.h
+++ b/bsd/miscfs/union/union.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -67,115 +67,5 @@
 #ifndef __UNION_UNION_H__
 #define __UNION_UNION_H__
 
-#include  <sys/appleapiopts.h>
-#include  <sys/cdefs.h>
 
-#ifdef __APPLE_API_PRIVATE
-struct union_args {
-	char		*target;	/* Target of loopback  */
-	int		mntflags;	/* Options on the mount */
-};
-
-#define UNMNT_ABOVE	0x0001		/* Target appears below mount point */
-#define UNMNT_BELOW	0x0002		/* Target appears below mount point */
-#define UNMNT_REPLACE	0x0003		/* Target replaces mount point */
-#define UNMNT_OPMASK	0x0003
-
-struct union_mount {
-	struct vnode	*um_uppervp;
-	struct vnode	*um_lowervp;
-	struct ucred	*um_cred;	/* Credentials of user calling mount */
-	int		um_cmode;	/* cmask from mount process */
-	int		um_op;		/* Operation mode */
-};
-
-#ifdef KERNEL
-/* LP64 version of union_args.  all pointers 
- * grow when we're dealing with a 64-bit process.
- * WARNING - keep in sync with union_args
- */
-/* LP64todo - should this move? */
-
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
-struct user_union_args {
-	user_addr_t	target;		/* Target of loopback  */
-	int			mntflags;	/* Options on the mount */
-};
-
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
-/*
- * DEFDIRMODE is the mode bits used to create a shadow directory.
- */
-#define VRWXMODE (VREAD|VWRITE|VEXEC)
-#define VRWMODE (VREAD|VWRITE)
-#define UN_DIRMODE ((VRWXMODE)|(VRWXMODE>>3)|(VRWXMODE>>6))
-#define UN_FILEMODE ((VRWMODE)|(VRWMODE>>3)|(VRWMODE>>6))
-
-/*
- * A cache of vnode references
- */
-struct union_node {
-	LIST_ENTRY(union_node)	un_cache;	/* Hash chain */
-	struct vnode		*un_vnode;	/* Back pointer */
-	struct vnode	        *un_uppervp;	/* overlaying object */
-	struct vnode	        *un_lowervp;	/* underlying object */
-	struct vnode		*un_dirvp;	/* Parent dir of uppervp */
-	struct vnode		*un_pvp;	/* Parent vnode */
-	char			*un_path;	/* saved component name */
-	int			un_hash;	/* saved un_path hash value */
-	int			un_openl;	/* # of opens on lowervp */
-	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 */
-#if DIAGNOSTIC
-	pid_t			un_pid;
-#endif
-};
-
-#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 */
-
-extern int union_allocvp(struct vnode **, struct mount *,
-				struct vnode *, struct vnode *,
-				struct componentname *, struct vnode *,
-				struct vnode *, int);
-extern int union_copyfile(struct vnode *, struct vnode *,
-					struct ucred *, struct proc *);
-extern int union_copyup(struct union_node *, int, struct ucred *,
-				struct proc *);
-extern int union_dowhiteout(struct union_node *, vfs_context_t);
-extern int union_mkshadow(struct union_mount *, struct vnode *,
-				struct componentname *, struct vnode **);
-extern int union_mkwhiteout(struct union_mount *, struct vnode *,
-				struct componentname *, char *);
-extern int union_vn_create(struct vnode **, struct union_node *, struct proc *);
-extern int union_cn_close(struct vnode *, int, struct ucred *, struct proc *);
-extern void union_removed_upper(struct union_node *un);
-extern struct vnode *union_lowervp(struct vnode *);
-extern void union_newlower(struct union_node *, struct vnode *);
-extern void union_newupper(struct union_node *, struct vnode *);
-extern void union_newsize(struct vnode *, off_t, off_t);
-
-#define	MOUNTTOUNIONMOUNT(mp) ((struct union_mount *)((mp)->mnt_data))
-#define	VTOUNION(vp) ((struct union_node *)(vp)->v_data)
-#define	UNIONTOV(un) ((un)->un_vnode)
-#define	LOWERVP(vp) (VTOUNION(vp)->un_lowervp)
-#define	UPPERVP(vp) (VTOUNION(vp)->un_uppervp)
-#define OTHERVP(vp) (UPPERVP(vp) ? UPPERVP(vp) : LOWERVP(vp))
-
-extern int (**union_vnodeop_p)(void *);
-extern struct vfsops union_vfsops;
-#endif /* KERNEL */
-
-#endif /* __APPLE_API_PRIVATE */
 #endif /* __UNION_UNION_H__ */