X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/bsd/sys/mount_internal.h

diff --git a/bsd/sys/mount_internal.h b/bsd/sys/mount_internal.h
index f91ca7273..b2a87e88a 100644
--- a/bsd/sys/mount_internal.h
+++ b/bsd/sys/mount_internal.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
- * 
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
  * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code 
@@ -234,14 +234,10 @@ struct vfsmount_args {
  * LP64 version of statfs structure.
  * NOTE - must be kept in sync with struct statfs in mount.h
  */
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct user_statfs {
 	short		f_otype;		/* TEMPORARY SHADOW COPY OF f_type */
 	short		f_oflags;		/* TEMPORARY SHADOW COPY OF f_flags */
-	user_long_t	f_bsize;		/* fundamental file system block size */
+	user_long_t	f_bsize __attribute((aligned(8)));		/* fundamental file system block size */
 	user_long_t	f_iosize;		/* optimal transfer block size */
 	user_long_t	f_blocks;		/* total data blocks in file system */
 	user_long_t	f_bfree;		/* free blocks in fs */
@@ -262,14 +258,10 @@ struct user_statfs {
 	user_long_t	f_reserved4[0];	/* For future use */
 #else
 	char		f_reserved3;	/* For alignment */
-	user_long_t	f_reserved4[4];	/* For future use */
+	user_long_t	f_reserved4[4] __attribute((aligned(8)));	/* For future use */
 #endif
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 __BEGIN_DECLS
 
 extern TAILQ_HEAD(mntlist, mount) mountlist;
@@ -291,7 +283,7 @@ errno_t	vfs_init_io_attributes(vnode_t, mount_t);
 int	vfs_mountroot(void);
 void	vfs_unmountall(void);
 int	safedounmount(struct mount *, int, struct proc *);
-int	dounmount(struct mount *, int, struct proc *);
+int	dounmount(struct mount *, int, int *, struct proc *);
 
 /* xnuy internal api */
 void  mount_dropcrossref(mount_t, vnode_t, int);