xnu-344.21.73.tar.gz

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

diff --git a/bsd/vfs/vfs_support.c b/bsd/vfs/vfs_support.c
index 24a1fa77aa443b1095f89bfb7a0b6dee6d10ce42..c74bde6fa27e2895f1cf569877b506aff820af64 100644 (file)
--- a/bsd/vfs/vfs_support.c
+++ b/bsd/vfs/vfs_support.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -375,6 +378,7 @@ struct vop_select_args /* {
        int a_which;
        int a_fflags;
        struct ucred *a_cred;
+       void *a_wql;
        struct proc *a_p;
 } */;
 
@@ -1045,6 +1049,7 @@ struct vop_allocate_args /* {
        off_t a_length;
        u_int32_t a_flags;
        off_t *a_bytesallocated;
+       off_t a_offset;
        struct ucred *a_cred;
        struct proc *a_p;
 } */;
@@ -1153,14 +1158,14 @@ struct vop_pagein_args /* {
 int
 nop_pagein(struct vop_pagein_args *ap)
 {
-       kernel_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
+       ubc_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
        return (0);
 }
 
 int
 err_pagein(struct vop_pagein_args *ap)
 {
-       kernel_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
+       ubc_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
        return (EOPNOTSUPP);
 }
 
@@ -1178,14 +1183,14 @@ struct vop_pageout_args /* {
 int
 nop_pageout(struct vop_pageout_args *ap)
 {
-       kernel_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
+       ubc_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
        return (0);
 }
 
 int
 err_pageout(struct vop_pageout_args *ap)
 {
-       kernel_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
+       ubc_upl_abort(ap->a_pl, UPL_ABORT_ERROR);
        return (EOPNOTSUPP);
 }