xnu-3789.41.3.tar.gz

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

diff --git a/bsd/sys/vnioctl.h b/bsd/sys/vnioctl.h
index 43f0c86f9409df4d19bb1372d199501eda5a9e99..12e1b474195617620e994f0d72aa115c4245d3db 100644 (file)
--- a/bsd/sys/vnioctl.h
+++ b/bsd/sys/vnioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -94,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 */
 
@@ -124,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 */