xnu-792.24.17.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..e913df01491574dea0d8aa7cec70c85c742cc7e1 100644 (file)
--- a/bsd/kern/kern_aio.c
+++ b/bsd/kern/kern_aio.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.

  * 
  * 

- * 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -2062,11 +2061,15 @@ do_aio_write( aio_workq_entry *entryp )
                return(EBADF);
        }
        if ( fp != NULL ) {
                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);
        }
                
                fp_drop(entryp->procp, entryp->aiocb.aio_fildes, fp, 0);
        }