xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / vfs / vfs_cluster.c

diff --git a/bsd/vfs/vfs_cluster.c b/bsd/vfs/vfs_cluster.c
index 41de0c840f6b79b87737e043c6e6ea48ab5441af..616f09e1ca6222a66fb8ff45738367bcaaae56c4 100644 (file)
--- a/bsd/vfs/vfs_cluster.c
+++ b/bsd/vfs/vfs_cluster.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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,
- * 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@
  */
@@ -79,7 +76,6 @@
 
 #include <sys/kdebug.h>
 
-
 #define CL_READ      0x01
 #define CL_ASYNC     0x02
 #define CL_COMMIT    0x04
@@ -118,7 +114,7 @@ static int cluster_phys_write(struct vnode *vp, struct uio *uio,
                off_t newEOF, int devblocksize, int flags);
 static int cluster_align_phys_io(struct vnode *vp, struct uio *uio,
                 addr64_t usr_paddr, int xsize, int devblocksize, int flags);
-static int cluster_push_x(struct vnode *vp, off_t EOF, daddr_t first, daddr_t last, int can_delay);
+static int cluster_push_x(struct vnode *vp, off_t EOF, unsigned int first, unsigned int last, int can_delay);
 static int cluster_try_push(struct vnode *vp, off_t EOF, int can_delay, int push_all);
 
 static int sparse_cluster_switch(struct vnode *vp, off_t EOF);
@@ -3548,8 +3544,8 @@ static int
 cluster_push_x(vp, EOF, first, last, can_delay)
         struct vnode *vp;
        off_t  EOF;
-       daddr_t first;
-       daddr_t last;
+       unsigned int first;
+       unsigned int last;
        int    can_delay;
 {
        upl_page_info_t *pl;
@@ -3576,7 +3572,7 @@ cluster_push_x(vp, EOF, first, last, can_delay)
                return (1);
        }
        upl_size = pages_in_upl * PAGE_SIZE;
-       upl_f_offset = ((off_t)first) * PAGE_SIZE_64;
+       upl_f_offset = (off_t)((unsigned long long)first * PAGE_SIZE_64);
 
        if (upl_f_offset + upl_size >= EOF) {
 
@@ -3722,8 +3718,8 @@ sparse_cluster_switch(struct vnode *vp, off_t EOF)
 static int
 sparse_cluster_push(struct vnode *vp, off_t EOF, int push_all)
 {
-        daddr_t first;
-       daddr_t last;
+        unsigned int first;
+       unsigned int last;
         off_t offset;
        u_int length;
 
@@ -3738,8 +3734,8 @@ sparse_cluster_push(struct vnode *vp, off_t EOF, int push_all)
                        vp->v_clen = 0;
                        break;
                }
-               first = (daddr_t)(offset / PAGE_SIZE_64);
-               last  = (daddr_t)((offset + length) / PAGE_SIZE_64);
+               first = (unsigned int)(offset / PAGE_SIZE_64);
+               last  = (unsigned int)((offset + length) / PAGE_SIZE_64);
 
                cluster_push_x(vp, EOF, first, last, 0);
 
@@ -3829,8 +3825,8 @@ cluster_align_phys_io(struct vnode *vp, struct uio *uio, addr64_t usr_paddr, int
 //             copypv(ubc_paddr, usr_paddr, xsize, cppvPsrc | cppvPsnk | cppvFsnk);    /* Copy physical to physical and flush the destination */
                copypv(ubc_paddr, usr_paddr, xsize,        2 |        1 |        4);    /* Copy physical to physical and flush the destination */
        else
-//             copypv(ubc_paddr, usr_paddr, xsize, cppvPsrc | cppvPsnk | cppvFsrc);    /* Copy physical to physical and flush the source */
-               copypv(ubc_paddr, usr_paddr, xsize,        2 |        1 |        8);    /* Copy physical to physical and flush the source */
+//             copypv(usr_paddr, ubc_paddr, xsize, cppvPsrc | cppvPsnk | cppvFsrc);    /* Copy physical to physical and flush the source */
+               copypv(usr_paddr, ubc_paddr, xsize,        2 |        1 |        8);    /* Copy physical to physical and flush the source */
        
        if ( !(flags & CL_READ) || (upl_valid_page(pl, 0) && upl_dirty_page(pl, 0))) {
                /*