xnu-2782.30.5.tar.gz

[apple/xnu.git] / bsd / sys / vnioctl.h

diff --git a/bsd/sys/vnioctl.h b/bsd/sys/vnioctl.h
index 37bb0de238a613ddc614c9c3a922beaaacef5239..12e1b474195617620e994f0d72aa115c4245d3db 100644 (file)
--- a/bsd/sys/vnioctl.h
+++ b/bsd/sys/vnioctl.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 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) 1988 University of Utah.
@@ -88,19 +94,17 @@ struct vn_ioctl {
 
 #ifdef KERNEL_PRIVATE
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
-struct user_vn_ioctl {
+struct vn_ioctl_64 {
        u_int64_t       vn_file;        /* pathname of file to mount */
        int                     vn_size;        /* (returned) size of disk */
        vncontrol_t     vn_control;
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+struct vn_ioctl_32 {
+       u_int32_t       vn_file;        /* pathname of file to mount */
+       int                     vn_size;        /* (returned) size of disk */
+       vncontrol_t     vn_control;
+};
 
 #endif /* KERNEL_PRIVATE */
 
@@ -118,9 +122,14 @@ struct user_vn_ioctl {
 #define VNIOCUCLEAR    _IOWR('F', 5, u_int32_t )               /* reset --//-- */
 #define VNIOCSHADOW    _IOWR('F', 6, struct vn_ioctl)  /* attach shadow */
 #ifdef KERNEL_PRIVATE
-#define VNIOCATTACH64  _IOWR('F', 0, struct user_vn_ioctl)     /* attach file - LP64 */
-#define VNIOCDETACH64  _IOWR('F', 1, struct user_vn_ioctl)     /* detach disk - LP64 */
-#define VNIOCSHADOW64  _IOWR('F', 6, struct user_vn_ioctl)     /* attach shadow - LP64 */
+#define VNIOCATTACH64  _IOWR('F', 0, struct vn_ioctl_64)       /* attach file - LP64 */
+#define VNIOCDETACH64  _IOWR('F', 1, struct vn_ioctl_64)       /* detach disk - LP64 */
+#define VNIOCSHADOW64  _IOWR('F', 6, struct vn_ioctl_64)       /* attach shadow - LP64 */
+#ifdef __LP64__
+#define VNIOCATTACH32  _IOWR('F', 0, struct vn_ioctl_32)       /* attach file - U32 version for K64 */
+#define VNIOCDETACH32  _IOWR('F', 1, struct vn_ioctl_32)       /* detach disk - U32 version for K64 */
+#define VNIOCSHADOW32  _IOWR('F', 6, struct vn_ioctl_32)       /* attach shadow - U32 version for K64 */
+#endif
 #endif /* KERNEL_PRIVATE */
 
 #define VN_LABELS      0x1     /* Use disk(/slice) labels */