xnu-792.25.20.tar.gz

[apple/xnu.git] / bsd / ufs / ffs / ffs_inode.c

diff --git a/bsd/ufs/ffs/ffs_inode.c b/bsd/ufs/ffs/ffs_inode.c
index bdedb24f00cec5553f4d854e41b4dc10cd1c8820..2887b305c86338fbbe28ab9382c8c2affa0d58de 100644 (file)
--- a/bsd/ufs/ffs/ffs_inode.c
+++ b/bsd/ufs/ffs/ffs_inode.c
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @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. 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.
+ * 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.

  * 
  * 

- * 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
+ * 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,
  * 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_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -90,7 +84,7 @@
 
 #if REV_ENDIAN_FS
 #include <ufs/ufs/ufs_byte_order.h>
 
 #if REV_ENDIAN_FS
 #include <ufs/ufs/ufs_byte_order.h>

-#include <architecture/byte_order.h>
+#include <libkern/OSByteOrder.h>

 #endif /* REV_ENDIAN_FS */
 
 static int ffs_indirtrunc(struct inode *, ufs_daddr_t, ufs_daddr_t,
 #endif /* REV_ENDIAN_FS */
 
 static int ffs_indirtrunc(struct inode *, ufs_daddr_t, ufs_daddr_t,


@@ -549,7 +543,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
            i--, nlbn += factor) {
 #if    REV_ENDIAN_FS
                if (rev_endian)
            i--, nlbn += factor) {
 #if    REV_ENDIAN_FS
                if (rev_endian)

-                       nb = NXSwapLong(bap[i]);
+                       nb = OSSwapInt32(bap[i]);

                else {
 #endif /* REV_ENDIAN_FS */
                        nb = bap[i];
                else {
 #endif /* REV_ENDIAN_FS */
                        nb = bap[i];


@@ -575,7 +569,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
                last = lastbn % factor;
 #if    REV_ENDIAN_FS
                if (rev_endian)
                last = lastbn % factor;
 #if    REV_ENDIAN_FS
                if (rev_endian)

-                       nb = NXSwapLong(bap[i]);
+                       nb = OSSwapInt32(bap[i]);

                else {
 #endif /* REV_ENDIAN_FS */
                        nb = bap[i];
                else {
 #endif /* REV_ENDIAN_FS */
                        nb = bap[i];