xnu-792.21.3.tar.gz

[apple/xnu.git] / bsd / miscfs / nullfs / null.h

diff --git a/bsd/miscfs/nullfs/null.h b/bsd/miscfs/nullfs/null.h
index d709c61b7ad94ccd0786930b6d3956666b0842f3..659ccb8004acd1fa4dbaa3e8685f4a8574d7425c 100644 (file)
--- a/bsd/miscfs/nullfs/null.h
+++ b/bsd/miscfs/nullfs/null.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -59,7 +65,12 @@
  *
  *     null.h  8.2 (Berkeley) 1/21/94
  */
+#ifdef __NULLFS_NULL_H__
+#define __NULLFS_NULL_H__
+
+#include  <sys/appleapiopts.h>
 
+#ifdef __APPLE_API_PRIVATE
 struct null_args {
        char            *target;        /* Target of loopback  */
 };
@@ -70,6 +81,15 @@ struct null_mount {
 };
 
 #ifdef KERNEL
+/* LP64 version of null_args.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with null_args
+ */
+/* LP64todo - should this move? */
+struct user_null_args {
+       user_addr_t             target; /* Target of loopback  */
+};
+
 /*
  * A cache of vnode references
  */
@@ -79,13 +99,13 @@ struct null_node {
        struct vnode            *null_vnode;    /* Back pointer */
 };
 
-extern int null_node_create __P((struct mount *mp, struct vnode *target, struct vnode **vpp));
+extern int null_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
 
 #define        MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))
 #define        VTONULL(vp) ((struct null_node *)(vp)->v_data)
 #define        NULLTOV(xp) ((xp)->null_vnode)
 #ifdef NULLFS_DIAGNOSTIC
-extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
+extern struct vnode *null_checkvp(struct vnode *vp, char *fil, int lno);
 #define        NULLVPTOLOWERVP(vp) null_checkvp((vp), __FILE__, __LINE__)
 #else
 #define        NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
@@ -94,3 +114,6 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 extern int (**null_vnodeop_p)(void *);
 extern struct vfsops null_vfsops;
 #endif /* KERNEL */
+
+#endif /* __APPLE_API_PRIVATE */
+#endif /* __NULLFS_NULL_H__ */