xnu-792.10.96.tar.gz

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

diff --git a/bsd/sys/mount.h b/bsd/sys/mount.h
index 9aff5e08e24d9e5272cf922cd86008e82f73e974..e2078d904460dbe95c2851c98e764014d48a8f42 100644 (file)
--- a/bsd/sys/mount.h
+++ b/bsd/sys/mount.h
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -114,9 +113,7 @@ struct statfs {
 
 #define        MFSTYPENAMELEN  16      /* length of fs type name including null */
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct vfsstatfs {
        uint32_t        f_bsize;        /* fundamental file system block size */
@@ -137,9 +134,7 @@ struct vfsstatfs {
        void            *f_reserved[2];         /* For future use == 0 */
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 #define VFSATTR_INIT(s)                        ((s)->f_supported = (s)->f_active = 0LL)
 #define VFSATTR_SET_SUPPORTED(s, a)    ((s)->f_supported |= VFSATTR_ ## a)
@@ -178,9 +173,7 @@ struct vfsstatfs {
 /*
  * New VFS_STAT argument structure.
  */
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct vfs_attr {
        uint64_t        f_supported;
@@ -218,9 +211,7 @@ struct vfs_attr {
        uint16_t        f_carbon_fsid;  /* same as Carbon's FSVolumeInfo.filesystemID */
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 /*
  * User specifiable flags.
@@ -345,32 +336,24 @@ struct vfsidctl {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with vfsconf
  */
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct user_vfsconf {
        user_addr_t     vfc_vfsops;                             /* filesystem operations vector */
        char                    vfc_name[MFSNAMELEN];   /* filesystem type name */
        int                     vfc_typenum;            /* historic filesystem type number */
        int                     vfc_refcount;           /* number mounted of this type */
        int                     vfc_flags;                              /* permanent flags */
-       user_addr_t     vfc_mountroot;          /* if != NULL, routine to mount root */
+       user_addr_t     vfc_mountroot __attribute((aligned(8)));        /* if != NULL, routine to mount root */
        user_addr_t     vfc_next;                               /* next in list */
 };
 
 struct user_vfsidctl {
        int                             vc_vers;        /* should be VFSIDCTL_VERS1 (below) */
        fsid_t                  vc_fsid;                /* fsid to operate on. */
-       user_addr_t             vc_ptr;                 /* pointer to data structure. */
+       user_addr_t             vc_ptr __attribute((aligned(8)));       /* pointer to data structure. */
        user_size_t             vc_len;                 /* sizeof said structure. */
        u_int32_t               vc_spare[12];   /* spare (must be zero). */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 #endif /* KERNEL */
 
 /*