xnu-792.18.15.tar.gz

[apple/xnu.git] / bsd / kern / kern_aio.c

diff --git a/bsd/kern/kern_aio.c b/bsd/kern/kern_aio.c
index 7bc446c56d880d2260cdc7ab90789cfa882a6b6f..aadb1654db2179fd677269d589072b68608cff1a 100644 (file)
--- a/bsd/kern/kern_aio.c
+++ b/bsd/kern/kern_aio.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 
@@ -2062,11 +2067,15 @@ do_aio_write( aio_workq_entry *entryp )
                return(EBADF);
        }
        if ( fp != NULL ) {
-               error = dofilewrite( entryp->procp, fp, entryp->aiocb.aio_fildes, 
-                                                        entryp->aiocb.aio_buf, 
-                                                        entryp->aiocb.aio_nbytes,
-                                                        entryp->aiocb.aio_offset, FOF_OFFSET, 
-                                                        &entryp->returnval );
+               /* NB: tell dofilewrite the offset, and to use the proc cred */
+               error = dofilewrite( entryp->procp,
+                                    fp,
+                                    entryp->aiocb.aio_fildes,
+                                    entryp->aiocb.aio_buf,
+                                    entryp->aiocb.aio_nbytes,
+                                    entryp->aiocb.aio_offset,
+                                    FOF_OFFSET | FOF_PCRED,
+                                    &entryp->returnval);
                
                fp_drop(entryp->procp, entryp->aiocb.aio_fildes, fp, 0);
        }
@@ -2199,10 +2208,8 @@ aio_init( void )
        int                     i;
        
        aio_lock_grp_attr = lck_grp_attr_alloc_init();
-       lck_grp_attr_setstat(aio_lock_grp_attr);
        aio_lock_grp = lck_grp_alloc_init("aio", aio_lock_grp_attr);
        aio_lock_attr = lck_attr_alloc_init();
-       //lck_attr_setdebug(aio_lock_attr);
 
        aio_lock = lck_mtx_alloc_init(aio_lock_grp, aio_lock_attr);